diff options
Diffstat (limited to 'xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx')
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 5fd173689ba9..ef68129496d6 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -106,7 +106,7 @@ static char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*ar } SecurityEnvironment_NssImpl::SecurityEnvironment_NssImpl() : -m_pHandler( nullptr ) , m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList() { +m_pHandler( nullptr ) , m_tSymKeyList() { PK11_SetPasswordFunc( GetPasswordFunction ) ; } @@ -123,16 +123,6 @@ SecurityEnvironment_NssImpl::~SecurityEnvironment_NssImpl() { for( auto& symKey : m_tSymKeyList ) PK11_FreeSymKey( symKey ) ; } - - if( !m_tPubKeyList.empty() ) { - for( auto& pubKeyIt : m_tPubKeyList ) - SECKEY_DestroyPublicKey( pubKeyIt ) ; - } - - if( !m_tPriKeyList.empty() ) { - for( auto& priKey : m_tPriKeyList ) - SECKEY_DestroyPrivateKey( priKey ) ; - } } /* XServiceInfo */ @@ -313,15 +303,6 @@ SecurityEnvironment_NssImpl::getPersonalCertificates() } - //secondly, we try to find certificate from registered private keys. - if( !m_tPriKeyList.empty() ) { - for( const auto& priKey : m_tPriKeyList ) { - xcert = NssPrivKeyToXCert( priKey ) ; - if( xcert != nullptr ) - certsList.push_back( xcert ) ; - } - } - length = certsList.size() ; if( length != 0 ) { int i = 0; |