diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 14:04:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 14:04:38 +0200 |
| commit | bce779932b59990fbdf8278993f8bb9514781de2 (patch) | |
| tree | c54611ccfaa5ecdf455e23dd2638945736b1f771 | |
| parent | 015269478d77da29dd21e35348d7296fbf4ad903 (diff) | |
loplugin:oncevar (clang-cl): xmlsecurity
Change-Id: Ic5e4dac2626474dd3d44ef5097522bc7e2207cd1
| -rw-r--r-- | xmlsecurity/source/pdfio/pdfdocument.cxx | 3 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx index 5420196df7d8..68619d7047f7 100644 --- a/xmlsecurity/source/pdfio/pdfdocument.cxx +++ b/xmlsecurity/source/pdfio/pdfdocument.cxx @@ -805,8 +805,7 @@ bool ValidateSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignat * { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs9(9) * smime(16) id-aa(2) 47 } */ - OString aOid("1.2.840.113549.1.9.16.2.47"); - if (aOid == rAttr.pszObjId) + if (OString("1.2.840.113549.1.9.16.2.47") == rAttr.pszObjId) { rInformation.bHasSigningCertificate = true; break; diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index f4f5a7212373..e9ba525ff2f5 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -239,8 +239,6 @@ OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponen //was successful and therefore NSS_Shutdown should be called when terminating. bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContext > &rxContext, bool & out_nss_init ) { - bool return_value = true; - // this method must be called only once, no need for additional lock OString sCertDir; @@ -290,6 +288,8 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex out_nss_init = true; #ifdef XMLSEC_CRYPTO_NSS + bool return_value = true; + #if defined SYSTEM_NSS if (!SECMOD_HasRootCerts()) #endif @@ -343,9 +343,11 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex return_value = false; } } -#endif return return_value; +#else + return true; +#endif } } // namespace |