diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-11-25 17:26:41 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-11-28 11:40:05 +0200 |
| commit | ed22c0cdb1f92ad93ed33069bdb3153b323ca025 (patch) | |
| tree | 7e868ee6cf38e280f183edf02f5dba75bfeb79e7 /xmlsecurity | |
| parent | fb414a04fc38e0cf77a0e8d5cb65542d1df8dae8 (diff) | |
Bin SecurityEnvironment_MSCryptImpl::getPriKey() as it always returns NULL
Fallout from my previous commit.
Change-Id: I4436721e719514d6ecf7847113957827c910d65a
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 14 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index bdc8a8e06c56..444cf93c07cd 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -345,10 +345,6 @@ HCRYPTKEY SecurityEnvironment_MSCryptImpl::getPubKey( unsigned int position ) th return pubkey ; } -HCRYPTKEY SecurityEnvironment_MSCryptImpl::getPriKey( unsigned int ) throw( Exception , RuntimeException ) { - return NULL ; -} - #ifdef SAL_LOG_INFO // Based on sample code from MSDN @@ -1129,7 +1125,6 @@ xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Ex unsigned int i ; HCRYPTKEY symKey ; HCRYPTKEY pubKey ; - HCRYPTKEY priKey ; xmlSecKeysMngrPtr pKeysMngr = nullptr ; /*- @@ -1158,15 +1153,6 @@ xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Ex } /*- - * Adopt asymmetric private key into keys manager - */ - for( i = 0 ; ( priKey = getPriKey( i ) ) != NULL ; i ++ ) { - if( xmlSecMSCryptoAppliedKeysMngrPriKeyLoad( pKeysMngr, priKey ) < 0 ) { - throw RuntimeException() ; - } - } - - /*- * Adopt system default certificate store. */ if( defaultEnabled() ) { diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index d4cdab612faf..0c66ab335f52 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -173,8 +173,6 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper< virtual HCRYPTKEY getPubKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ; - virtual HCRYPTKEY getPriKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ; - virtual void enableDefaultCrypt( bool enable ) throw( css::uno::Exception , css::uno::RuntimeException ) ; virtual bool defaultEnabled() throw( css::uno::Exception , css::uno::RuntimeException ) ; |