diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-18 09:57:26 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-18 15:19:04 +0200 |
commit | 5d86154f49d713dada4aaa541755076cfeefa2c6 (patch) | |
tree | 25c34f4a032526de9798e6f3a69a76d993d739db /xmlsecurity | |
parent | 469892f65d9717fcee7996a040b32d713a83b412 (diff) |
loplugin:unusedfields improve search for unused collection fields
look for collection-like fields that are never added to, and are
therefore effectively unused
Change-Id: Id52c5500ea5e3d2436fb5915aebb86278bf2d925
Reviewed-on: https://gerrit.libreoffice.org/60661
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 21 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 2 |
2 files changed, 1 insertions, 22 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; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index c61ade4ab876..aec7f5bbcead 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -60,8 +60,6 @@ private: CERTCertDBHandle* m_pHandler ; std::list< PK11SymKey* > m_tSymKeyList ; - std::list< SECKEYPublicKey* > m_tPubKeyList ; - std::list< SECKEYPrivateKey* > m_tPriKeyList ; public: SecurityEnvironment_NssImpl(); |