rpms/gnupg2/devel gnupg-2.0.14-secmem.patch, NONE, 1.1 gnupg2.spec, 1.100, 1.101

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/gnupg2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20761

Modified Files:
	gnupg2.spec 
Added Files:
	gnupg-2.0.14-secmem.patch 
Log Message:
* Fri Jun 18 2010 Tomas Mraz <tmraz at redhat.com> - 2.0.14-3
- initialize small amount of secmem for list of algorithms in help (#598847)
  (necessary in the FIPS mode of libgcrypt)


gnupg-2.0.14-secmem.patch:
 g10/gpg.c  |    4 ++--
 sm/gpgsm.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gnupg-2.0.14-secmem.patch ---
diff -up gnupg-2.0.14/g10/gpg.c.secmem gnupg-2.0.14/g10/gpg.c
--- gnupg-2.0.14/g10/gpg.c.secmem	2009-12-21 15:00:55.000000000 +0100
+++ gnupg-2.0.14/g10/gpg.c	2010-06-18 18:03:24.000000000 +0200
@@ -789,7 +789,7 @@ make_libversion (const char *libname, co
   
   if (maybe_setuid)
     {
-      gcry_control (GCRYCTL_INIT_SECMEM, 0, 0);  /* Drop setuid. */
+      gcry_control (GCRYCTL_INIT_SECMEM, 4096, 0);  /* Drop setuid. */
       maybe_setuid = 0;
     }
   s = getfnc (NULL);
@@ -892,7 +892,7 @@ build_list( const char *text, char lette
     char *list, *p, *line=NULL;
 
     if (maybe_setuid)
-      gcry_control (GCRYCTL_INIT_SECMEM, 0, 0);  /* Drop setuid. */
+      gcry_control (GCRYCTL_INIT_SECMEM, 4096, 0);  /* Drop setuid. */
 
     for(i=0; i <= 110; i++ )
 	if( !chkf(i) && (s=mapf(i)) )
diff -up gnupg-2.0.14/sm/gpgsm.c.secmem gnupg-2.0.14/sm/gpgsm.c
--- gnupg-2.0.14/sm/gpgsm.c.secmem	2009-12-10 12:35:43.000000000 +0100
+++ gnupg-2.0.14/sm/gpgsm.c	2010-06-18 18:03:07.000000000 +0200
@@ -493,7 +493,7 @@ make_libversion (const char *libname, co
   
   if (maybe_setuid)
     {
-      gcry_control (GCRYCTL_INIT_SECMEM, 0, 0);  /* Drop setuid. */
+      gcry_control (GCRYCTL_INIT_SECMEM, 4096, 0);  /* Drop setuid. */
       maybe_setuid = 0;
     }
   s = getfnc (NULL);


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gnupg2.spec	9 Feb 2010 12:01:58 -0000	1.100
+++ gnupg2.spec	18 Jun 2010 16:13:38 -0000	1.101
@@ -2,7 +2,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.14
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -12,6 +12,7 @@ Source1: ftp://ftp.gnupg.org/gcrypt/%{?p
 #Source0: gnupg2-20090809svn.tar.bz2
 Patch1:  gnupg-2.0.13-insttools.patch
 Patch2:  gnupg-2.0.14-tests-s2kcount.patch
+Patch3:  gnupg-2.0.14-secmem.patch
 
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +73,7 @@ to the base GnuPG package 
 
 %patch1 -p1 -b .insttools
 %patch2 -p1 -b .s2k
+%patch3 -p1 -b .secmem
 
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
@@ -184,6 +186,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 18 2010 Tomas Mraz <tmraz at redhat.com> - 2.0.14-3
+- initialize small amount of secmem for list of algorithms in help (#598847)
+  (necessary in the FIPS mode of libgcrypt)
+
 * Tue Feb  9 2010 Tomas Mraz <tmraz at redhat.com> - 2.0.14-2
 - disable selinux support - it is too rudimentary and restrictive (#562982)