summaryrefslogtreecommitdiffstats
path: root/extra/openoffice/libxmlsec-findcerts.diff
blob: 65e0adb81fc4c3ab2c3b23a13cab8fd2b7e8e206 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
--- 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" ,