external/libxmlsec/xmlsec1-customkeymanage.patch.1 | 49 ---------- xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 21 ---- 2 files changed, 2 insertions(+), 68 deletions(-)
New commits: commit efe9d1df691350fe0253f20daf84d082f94f59cb Author: Tor Lillqvist <[email protected]> Date: Wed Dec 21 17:33:16 2016 +0200 Don't add empty TODO functions to libxmlsec, and don't call them Change-Id: Iaec1de29a0e7f3ea8eb10869382401d121de2c8a diff --git a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 b/external/libxmlsec/xmlsec1-customkeymanage.patch.1 index a0eb1e3..226d6c0 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 diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 47435d7..9da1520 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -1120,9 +1120,6 @@ OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() th xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Exception, RuntimeException ) { - unsigned int i ; - HCRYPTKEY symKey ; - HCRYPTKEY pubKey ; xmlSecKeysMngrPtr pKeysMngr = nullptr ; /*- @@ -1133,24 +1130,6 @@ xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Ex throw RuntimeException() ; /*- - * Adopt symmetric key into keys manager - */ - for( i = 0 ; ( symKey = getSymKey( i ) ) != NULL ; i ++ ) { - if( xmlSecMSCryptoAppliedKeysMngrSymKeyLoad( pKeysMngr, symKey ) < 0 ) { - throw RuntimeException() ; - } - } - - /*- - * Adopt asymmetric public key into keys manager - */ - for( i = 0 ; ( pubKey = getPubKey( i ) ) != NULL ; i ++ ) { - if( xmlSecMSCryptoAppliedKeysMngrPubKeyLoad( pKeysMngr, pubKey ) < 0 ) { - throw RuntimeException() ; - } - } - - /*- * Adopt system default certificate store. */ if( defaultEnabled() ) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
