From e06fa863719e767d4eb3d2035e6718d79952cbcc Mon Sep 17 00:00:00 2001 From: tnut Date: Thu, 4 Mar 2010 07:26:50 +0100 Subject: Maj openoffice#3.2.0- --- test/openoffice/libxmlsec-findcerts.diff | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100755 test/openoffice/libxmlsec-findcerts.diff (limited to 'test/openoffice/libxmlsec-findcerts.diff') diff --git a/test/openoffice/libxmlsec-findcerts.diff b/test/openoffice/libxmlsec-findcerts.diff deleted file mode 100755 index 65e0adb81..000000000 --- a/test/openoffice/libxmlsec-findcerts.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- libxmlsec/xmlsec1-1.2.6.patch -+++ libxmlsec/xmlsec1-1.2.6.patch -@@ -17395,3 +17395,25 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/src/nss/x509.c 2007-03-16 12:51:38.000000000 -0400 -+--- misc/build/xmlsec1-1.2.6/src/nss/x509.c 2007-03-19 11:23:22.000000000 -0400 -+*************** xmlSecNssKeyDataX509VerifyAndExtractKey( -+*** 1365,1373 **** -+ /*- -+ * I'll search key according to KeyReq. -+ */ -+- slot = cert->slot ; -+ if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) { -+! if( ( priKey = PK11_FindPrivateKeyFromCert( slot , cert , NULL ) ) == NULL ) { -+ xmlSecError( XMLSEC_ERRORS_HERE , -+ xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) , -+ "PK11_FindPrivateKeyFromCert" , -+--- 1365,1372 ---- -+ /*- -+ * I'll search key according to KeyReq. -+ */ -+ if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) { -+! if( ( priKey = PK11_FindKeyByAnyCert( cert , NULL ) ) == NULL ) { -+ xmlSecError( XMLSEC_ERRORS_HERE , -+ xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) , -+ "PK11_FindPrivateKeyFromCert" , -- cgit v1.2.3-70-g09d2