From 1fadc069caed1d23d2b636262d2044a52dbdcb60 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Sun, 27 Mar 2011 22:08:02 +0200
Subject: mav60: #164341# use simple nss initialization in case mscrypto is
 used

---
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'xmlsecurity')

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())
     {
@@ -351,6 +355,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa
         }
 #if SYSTEM_MOZILLA
     }
+#endif
 #endif
 
     return return_value;
-- 
cgit