diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-27 22:08:02 +0200 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-27 22:08:02 +0200 |
| commit | 1fadc069caed1d23d2b636262d2044a52dbdcb60 (patch) | |
| tree | 3c30b7ce920e326cab94c878a29de9876aa5c351 /xmlsecurity | |
| parent | a00f39b917848061206d518a95aea3a00a58ebaf (diff) | |
mav60: #164341# use simple nss initialization in case mscrypto is used
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 7e0d942e8e3c..ded32952d410 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -253,9 +253,12 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa // this method must be called only once, no need for additional lock rtl::OString sCertDir; + + (void) xMSF; +#ifdef XMLSEC_CRYPTO_NSS if ( xMSF.is() ) sCertDir = getMozillaCurrentProfile( xMSF ); - +#endif xmlsec_trace( "Using profile: %s", sCertDir.getStr() ); PR_Init( PR_USER_THREAD, PR_PRIORITY_NORMAL, 1 ) ; @@ -289,6 +292,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa } out_nss_init = true; +#ifdef XMLSEC_CRYPTO_NSS #if defined SYSTEM_MOZILLA if (!SECMOD_HasRootCerts()) { @@ -352,6 +356,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa #if SYSTEM_MOZILLA } #endif +#endif return return_value; } |