mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't add empty TODO functions to libxmlsec, and don't call them

Browse Source 
Change-Id: Iaec1de29a0e7f3ea8eb10869382401d121de2c8a
This commit is contained in:
Tor Lillqvist 2016-12-21 17:33:16 +02:00
parent 6aca7389c6
commit efe9d1df69
2 changed files with 2 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
external/libxmlsec/xmlsec1-customkeymanage.patch.1 vendored
View File

@ -73,7 +73,7 @@ new file mode 100644
index 0000000..4858192 index 0000000..4858192
--- /dev/null --- /dev/null
+++ b/include/xmlsec/mscrypto/akmngr.h +++ b/include/xmlsec/mscrypto/akmngr.h
@@ -0,0 +1,71 @@ @@ -0,0 +1,53 @@
+/** +/**
+ * XMLSec library + * XMLSec library
+ * + *
@ -103,24 +103,6 @@ index 0000000..4858192
+) ; +) ;
+ +
+XMLSEC_CRYPTO_EXPORT int +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 ( +xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore (
+ xmlSecKeysMngrPtr mngr , + xmlSecKeysMngrPtr mngr ,
+ HCERTSTORE keyStore + HCERTSTORE keyStore
@ -514,7 +496,7 @@ new file mode 100644
index 0000000..3bbd124 index 0000000..3bbd124
--- /dev/null --- /dev/null
+++ b/src/mscrypto/akmngr.c +++ b/src/mscrypto/akmngr.c
@@ -0,0 +1,236 @@ @@ -0,0 +1,209 @@
+/** +/**
+ * XMLSec library + * XMLSec library
+ * + *
@ -629,33 +611,6 @@ index 0000000..3bbd124
+} +}
+ +
+int +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 ( +xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore (
+ xmlSecKeysMngrPtr mngr , + xmlSecKeysMngrPtr mngr ,
+ HCERTSTORE keyStore + HCERTSTORE keyStore

21
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
View File

@ -1120,9 +1120,6 @@ OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() th
xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Exception, RuntimeException ) { xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Exception, RuntimeException ) {
unsigned int i ;
HCRYPTKEY symKey ;
HCRYPTKEY pubKey ;
xmlSecKeysMngrPtr pKeysMngr = nullptr ; xmlSecKeysMngrPtr pKeysMngr = nullptr ;
/*- /*-
@ -1132,24 +1129,6 @@ xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Ex
if( pKeysMngr == nullptr ) if( pKeysMngr == nullptr )
throw RuntimeException() ; 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. * Adopt system default certificate store.
*/ */