summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-12-21 17:33:16 +0200
committerTor Lillqvist <tml@collabora.com>2016-12-21 17:35:24 +0200
commitefe9d1df691350fe0253f20daf84d082f94f59cb (patch)
treea33e664d7f0ff2bc5836b1f57ad7572afcfd8db1 /external
parent6aca7389c63a39387fc08acfb824ba96037f5662 (diff)
Don't add empty TODO functions to libxmlsec, and don't call them
Change-Id: Iaec1de29a0e7f3ea8eb10869382401d121de2c8a
Diffstat (limited to 'external')
-rw-r--r--external/libxmlsec/xmlsec1-customkeymanage.patch.149
1 files changed, 2 insertions, 47 deletions
diff --git a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 b/external/libxmlsec/xmlsec1-customkeymanage.patch.1
index a0eb1e35c1f5..226d6c0394a1 100644
--- a/external/libxmlsec/xmlsec1-customkeymanage.patch.1
+++ b/external/libxmlsec/xmlsec1-customkeymanage.patch.1
@@ -73,7 +73,7 @@ new file mode 100644
index 0000000..4858192
--- /dev/null
+++ b/include/xmlsec/mscrypto/akmngr.h
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,53 @@
+/**
+ * XMLSec library
+ *
@@ -103,24 +103,6 @@ index 0000000..4858192
+) ;
+
+XMLSEC_CRYPTO_EXPORT int
-+xmlSecMSCryptoAppliedKeysMngrSymKeyLoad(
-+ xmlSecKeysMngrPtr mngr ,
-+ HCRYPTKEY symKey
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecMSCryptoAppliedKeysMngrPubKeyLoad(
-+ xmlSecKeysMngrPtr mngr ,
-+ HCRYPTKEY pubKey
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecMSCryptoAppliedKeysMngrPriKeyLoad(
-+ xmlSecKeysMngrPtr mngr ,
-+ HCRYPTKEY priKey
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
+xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore (
+ xmlSecKeysMngrPtr mngr ,
+ HCERTSTORE keyStore
@@ -514,7 +496,7 @@ new file mode 100644
index 0000000..3bbd124
--- /dev/null
+++ b/src/mscrypto/akmngr.c
-@@ -0,0 +1,236 @@
+@@ -0,0 +1,209 @@
+/**
+ * XMLSec library
+ *
@@ -629,33 +611,6 @@ index 0000000..3bbd124
+}
+
+int
-+xmlSecMSCryptoAppliedKeysMngrSymKeyLoad(
-+ xmlSecKeysMngrPtr mngr ,
-+ HCRYPTKEY symKey
-+) {
-+ /*TODO: import the key into keys manager.*/
-+ return(0) ;
-+}
-+
-+int
-+xmlSecMSCryptoAppliedKeysMngrPubKeyLoad(
-+ xmlSecKeysMngrPtr mngr ,
-+ HCRYPTKEY pubKey
-+) {
-+ /*TODO: import the key into keys manager.*/
-+ return(0) ;
-+}
-+
-+int
-+xmlSecMSCryptoAppliedKeysMngrPriKeyLoad(
-+ xmlSecKeysMngrPtr mngr ,
-+ HCRYPTKEY priKey
-+) {
-+ /*TODO: import the key into keys manager.*/
-+ return(0) ;
-+}
-+
-+int
+xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore (
+ xmlSecKeysMngrPtr mngr ,
+ HCERTSTORE keyStore