summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--external/libxmlsec/UnpackedTarball_xmlsec.mk1
-rw-r--r--external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.152
2 files changed, 0 insertions, 53 deletions
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index f41434c6d76b..e07601c594be 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -9,7 +9,6 @@
xmlsec_patches :=
xmlsec_patches += xmlsec1-configure.patch.1
-xmlsec_patches += xmlsec1-nssdisablecallbacks.patch.1
xmlsec_patches += xmlsec1-vc.patch.1
xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
xmlsec_patches += xmlsec1-customkeymanage.patch.1
diff --git a/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1 b/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1
deleted file mode 100644
index 3833bd23fb4d..000000000000
--- a/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1
+++ /dev/null
@@ -1,52 +0,0 @@
-From 25b4d8494eaf7b2321a931e29af292f336fe0aff Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-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 a0559c89..ba8f2dd0 100644
---- a/src/nss/crypto.c
-+++ b/src/nss/crypto.c
-@@ -227,6 +227,7 @@ xmlSecCryptoGetFunctions_nss(void) {
- * High level routines form xmlsec command line utility
- *
- ********************************************************************/
-+#if 0
- gXmlSecNssFunctions->cryptoAppInit = xmlSecNssAppInit;
- gXmlSecNssFunctions->cryptoAppShutdown = xmlSecNssAppShutdown;
- gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit = xmlSecNssAppDefaultKeysMngrInit;
-@@ -244,6 +245,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.12.0
-