rpms/openssl/devel libica-1.3.6-stale-handles.patch, NONE, 1.1 openssl-0.9.8a-padlock.patch, NONE, 1.1 openssl.spec, 1.69, 1.70

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11618

Modified Files:
	openssl.spec 
Added Files:
	libica-1.3.6-stale-handles.patch openssl-0.9.8a-padlock.patch 
Log Message:
* Tue Apr  4 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8a-6
- fix stale open handles in libica (#177155)
- fix build if 'rand' or 'passwd' in buildroot path (#178782)
- initialize VIA Padlock engine (#186857)


libica-1.3.6-stale-handles.patch:
 icalinux.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libica-1.3.6-stale-handles.patch ---
--- libica-1.3.6-rc3/src/icalinux.c.stale-handles	2005-10-21 17:35:03.000000000 +0200
+++ libica-1.3.6-rc3/src/icalinux.c	2006-01-12 21:01:20.000000000 +0100
@@ -1024,7 +1024,7 @@
 		NEWMECH(CKM_AES_KEY_GEN, 0, 0, CKF_GENERATE)
 	}
 
-	if (icaOpenAdapter(0, &handle)) {
+	if (icaOpenAdapter(0, &handle) == 0) { // 0 == success
 		NEWMECH(CKM_RSA_PKCS, 128, 2048,
 			CKF_HW | CKF_ENCRYPT | CKF_DECRYPT | CKF_SIGN |
 			CKF_SIGN_RECOVER | CKF_VERIFY | CKF_VERIFY_RECOVER |

openssl-0.9.8a-padlock.patch:
 eng_all.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openssl-0.9.8a-padlock.patch ---
--- openssl-0.9.8a/crypto/engine/eng_all.c.padlock	2005-11-22 16:36:22.000000000 +0100
+++ openssl-0.9.8a/crypto/engine/eng_all.c	2006-04-04 18:03:13.000000000 +0200
@@ -72,6 +72,9 @@
 #if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_IBMCA)
 	ENGINE_load_ibmca();
 #endif
+#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
+	ENGINE_load_padlock();
+#endif
 #ifndef OPENSSL_NO_STATIC_ENGINE
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_4758_CCA
@@ -98,9 +101,6 @@
 #ifndef OPENSSL_NO_HW_UBSEC
 	ENGINE_load_ubsec();
 #endif
-#ifndef OPENSSL_NO_HW_PADLOCK
-	ENGINE_load_padlock();
-#endif
 #endif
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 	ENGINE_load_cryptodev();


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- openssl.spec	11 Feb 2006 04:53:59 -0000	1.69
+++ openssl.spec	4 Apr 2006 17:45:56 -0000	1.70
@@ -23,7 +23,7 @@
 Summary: The OpenSSL toolkit.
 Name: openssl
 Version: 0.9.8a
-Release: 5.2
+Release: 6
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -48,6 +48,8 @@
 Patch20: libica-1.3.4-urandom.patch
 Patch21: libica-1.3.6-linkcrypto.patch
 Patch22: openssl-0.9.8a-ICA_engine-sep142005.patch
+Patch23: libica-1.3.6-stale-handles.patch
+Patch24: openssl-0.9.8a-padlock.patch
 # Functionality changes
 Patch32: openssl-0.9.7-beta6-ia64.patch
 Patch33: openssl-0.9.7f-ca-dir.patch
@@ -111,8 +113,10 @@
 # generator.
 %patch20 -p2 -b .urandom
 %patch21 -p1 -b .linkcrypto
+%patch23 -p1 -b .stale-handles
 popd
 %patch22 -p1 -b .ibmca
+%patch24 -p1 -b .padlock
 
 %patch32 -p1 -b .ia64
 #patch33 is applied after make test
@@ -232,7 +236,8 @@
 done
 
 # Rename man pages so that they don't conflict with other system man pages.
-for manpage in $RPM_BUILD_ROOT%{_mandir}/man*/* ; do
+pushd $RPM_BUILD_ROOT%{_mandir}
+for manpage in man*/* ; do
 	if [ -L ${manpage} ]; then
 		TARGET=`ls -l ${manpage} | awk '{ print $NF }'`
 		ln -snf ${TARGET}ssl ${manpage}ssl
@@ -242,8 +247,9 @@
 	fi
 done
 for conflict in passwd rand ; do
-	rename ${conflict} ssl${conflict} $RPM_BUILD_ROOT%{_mandir}/man*/${conflict}*
+	rename ${conflict} ssl${conflict} man*/${conflict}*
 done
+popd
 
 # Pick a CA script.
 pushd  $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/misc
@@ -382,6 +388,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr  4 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8a-6
+- fix stale open handles in libica (#177155)
+- fix build if 'rand' or 'passwd' in buildroot path (#178782)
+- initialize VIA Padlock engine (#186857)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8a-5.2
 - bump again for double-long bug on ppc(64)