618a465336
2009-10-01 15:20:03 +0200 jl r276605 : #1004856# moved to xmlsec1-mingw32.patch 2009-10-01 10:51:24 +0200 jl r276580 : #1004856# build keymgr with mingw 2009-10-01 10:50:52 +0200 jl r276579 : #1004856# build keymgr with mingw 2009-10-01 10:37:28 +0200 jl r276578 : #1004856# do not build xmlsec1 app 2009-09-29 16:01:31 +0200 jl r276532 : #1004856# Using libxml2 from solver if available 2009-09-26 16:31:32 +0200 jl r276477 : #i104856# xmlsec1-mscrypto-1 is now xmlsec1-mscrypto 2009-09-25 17:05:26 +0200 jl r276470 : CWS-TOOLING: rebase CWS jl135_nss to trunk@276429 (milestone: DEV300:m60) 2009-09-24 12:57:10 +0200 jl r276419 : #i104856# libxmlsec update 2009-09-24 12:46:58 +0200 jl r276418 : #i104856# fixing mac configure problem in configure.in and regenerating configure 2009-09-23 16:49:54 +0200 jl r276405 : i#104856# configure failed on mac 2009-09-23 10:21:35 +0200 jl r276369 : #i104856# adapting patches to apply cleanly and readme change 2009-09-21 13:45:47 +0200 jl r276326 : #i104856 updating to 1.2.12, using changes patches from cmc made on xmlsec1_2_12 2009-09-21 11:27:46 +0200 jl r276319 : #i105183# forget to uncomment PATCH_FILES 2009-09-18 17:41:20 +0200 jl r276296 : #i105183# update of nss libs
36 lines
1.8 KiB
Diff
36 lines
1.8 KiB
Diff
--- misc/xmlsec1-1.2.12.orig/src/nss/crypto.c 2009-09-10 07:06:17.000000000 -0400
|
|
+++ misc/build/xmlsec1-1.2.12/src/nss/crypto.c 2009-09-10 07:08:24.000000000 -0400
|
|
@@ -136,6 +136,7 @@
|
|
/**
|
|
* High level routines form xmlsec command line utility
|
|
*/
|
|
+#if 0
|
|
gXmlSecNssFunctions->cryptoAppInit = xmlSecNssAppInit;
|
|
gXmlSecNssFunctions->cryptoAppShutdown = xmlSecNssAppShutdown;
|
|
gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit = xmlSecNssAppDefaultKeysMngrInit;
|
|
@@ -153,6 +154,25 @@
|
|
gXmlSecNssFunctions->cryptoAppKeyLoad = xmlSecNssAppKeyLoad;
|
|
gXmlSecNssFunctions->cryptoAppKeyLoadMemory = xmlSecNssAppKeyLoadMemory;
|
|
gXmlSecNssFunctions->cryptoAppDefaultPwdCallback = (void*)xmlSecNssAppGetDefaultPwdCallback();
|
|
+#else
|
|
+ gXmlSecNssFunctions->cryptoAppInit = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppShutdown = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppDefaultKeysMngrAdoptKey = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppDefaultKeysMngrLoad = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppDefaultKeysMngrSave = NULL ;
|
|
+#ifndef XMLSEC_NO_X509
|
|
+ gXmlSecNssFunctions->cryptoAppKeysMngrCertLoad = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppKeysMngrCertLoadMemory= NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppPkcs12Load = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppPkcs12LoadMemory = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppKeyCertLoad = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppKeyCertLoadMemory = NULL ;
|
|
+#endif /* XMLSEC_NO_X509 */
|
|
+ gXmlSecNssFunctions->cryptoAppKeyLoad = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppKeyLoadMemory = NULL ;
|
|
+ gXmlSecNssFunctions->cryptoAppDefaultPwdCallback = (void*)NULL ;
|
|
+#endif
|
|
|
|
return(gXmlSecNssFunctions);
|
|
}
|