diff options
| author | tnut <thierryn1 at hispeed dot ch> | 2010-03-04 07:26:50 +0100 |
|---|---|---|
| committer | tnut <thierryn1 at hispeed dot ch> | 2010-03-04 07:26:50 +0100 |
| commit | e06fa863719e767d4eb3d2035e6718d79952cbcc (patch) | |
| tree | 7be8aa6ddc6370ccefe2586ed1ce72debb93598b /extra/openoffice/libxmlsec-findcerts.diff | |
| parent | d1f50a6ce0d3ad4540268c8077fde2c3dd9caacb (diff) | |
| download | nutyx-extra-e06fa863719e767d4eb3d2035e6718d79952cbcc.tar.gz nutyx-extra-e06fa863719e767d4eb3d2035e6718d79952cbcc.tar.bz2 nutyx-extra-e06fa863719e767d4eb3d2035e6718d79952cbcc.tar.xz nutyx-extra-e06fa863719e767d4eb3d2035e6718d79952cbcc.zip | |
Maj openoffice#3.2.0-
Diffstat (limited to 'extra/openoffice/libxmlsec-findcerts.diff')
| -rwxr-xr-x | extra/openoffice/libxmlsec-findcerts.diff | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/extra/openoffice/libxmlsec-findcerts.diff b/extra/openoffice/libxmlsec-findcerts.diff new file mode 100755 index 000000000..65e0adb81 --- /dev/null +++ b/extra/openoffice/libxmlsec-findcerts.diff @@ -0,0 +1,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" , |