From b317891749a5dd23ad75ce289ac1a318851bda0d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:09:10 +0100 Subject: [PATCH] xmlsec1-nssdisablecallbacks.patch Conflicts: src/nss/crypto.c --- src/nss/crypto.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/nss/crypto.c b/src/nss/crypto.c index ea79519..473429f 100644 --- a/src/nss/crypto.c +++ b/src/nss/crypto.c @@ -214,6 +214,7 @@ xmlSecCryptoGetFunctions_nss(void) { * High level routines form xmlsec command line utility * ********************************************************************/ +#if 0 gXmlSecNssFunctions->cryptoAppInit = xmlSecNssAppInit; gXmlSecNssFunctions->cryptoAppShutdown = xmlSecNssAppShutdown; gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit = xmlSecNssAppDefaultKeysMngrInit; @@ -231,6 +232,25 @@ xmlSecCryptoGetFunctions_nss(void) { 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); } -- 2.6.6