external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1

   1 From 25b4d8494eaf7b2321a931e29af292f336fe0aff Mon Sep 17 00:00:00 2001
   2 From: Miklos Vajna <vmiklos@collabora.co.uk>
   3 Date: Fri, 4 Mar 2016 16:09:10 +0100
   4 Subject: [PATCH] xmlsec1-nssdisablecallbacks.patch
   5
   6 Conflicts:
   7         src/nss/crypto.c
   8 ---
   9  src/nss/crypto.c | 20 ++++++++++++++++++++
  10  1 file changed, 20 insertions(+)
  11
  12 diff --git a/src/nss/crypto.c b/src/nss/crypto.c
  13 index a0559c89..ba8f2dd0 100644
  14 --- a/src/nss/crypto.c
  15 +++ b/src/nss/crypto.c
  16 @@ -227,6 +227,7 @@ xmlSecCryptoGetFunctions_nss(void) {
  17       * High level routines form xmlsec command line utility
  18       *
  19       ********************************************************************/
  20 +#if 0
  21      gXmlSecNssFunctions->cryptoAppInit                  = xmlSecNssAppInit;
  22      gXmlSecNssFunctions->cryptoAppShutdown              = xmlSecNssAppShutdown;
  23      gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit   = xmlSecNssAppDefaultKeysMngrInit;
  24 @@ -244,6 +245,25 @@ xmlSecCryptoGetFunctions_nss(void) {
  25      gXmlSecNssFunctions->cryptoAppKeyLoad               = xmlSecNssAppKeyLoad;
  26      gXmlSecNssFunctions->cryptoAppKeyLoadMemory         = xmlSecNssAppKeyLoadMemory;
  27      gXmlSecNssFunctions->cryptoAppDefaultPwdCallback    = (void*)xmlSecNssAppGetDefaultPwdCallback();
  28 +#else
  29 +    gXmlSecNssFunctions->cryptoAppInit                  = NULL;
  30 +    gXmlSecNssFunctions->cryptoAppShutdown              = NULL;
  31 +    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit   = NULL;
  32 +    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrAdoptKey       = NULL;
  33 +    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrLoad   = NULL;
  34 +    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrSave   = NULL;
  35 +#ifndef XMLSEC_NO_X509
  36 +    gXmlSecNssFunctions->cryptoAppKeysMngrCertLoad      = NULL;
  37 +    gXmlSecNssFunctions->cryptoAppKeysMngrCertLoadMemory= NULL;
  38 +    gXmlSecNssFunctions->cryptoAppPkcs12Load            = NULL;
  39 +    gXmlSecNssFunctions->cryptoAppPkcs12LoadMemory      = NULL;
  40 +    gXmlSecNssFunctions->cryptoAppKeyCertLoad           = NULL;
  41 +    gXmlSecNssFunctions->cryptoAppKeyCertLoadMemory     = NULL;
  42 +#endif /* XMLSEC_NO_X509 */
  43 +    gXmlSecNssFunctions->cryptoAppKeyLoad               = NULL;
  44 +    gXmlSecNssFunctions->cryptoAppKeyLoadMemory         = NULL;
  45 +    gXmlSecNssFunctions->cryptoAppDefaultPwdCallback    = (void*)NULL;
  46 +#endif
  47
  48      return(gXmlSecNssFunctions);
  49  }
  50 --
  51 2.12.0
  52