From d6a49f2e041df75d662d7b170a24441f8453ed95 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Mon, 18 Aug 2008 12:16:11 +0000 Subject: INTEGRATION: CWS cmcfixes48 (1.21.22); FILE MERGED 2008/07/24 13:25:05 cmc 1.21.22.1: #i92087# ensure Root Certs are available --- xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 2a504dc7bf8a..5a3c80dfb162 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: seinitializer_nssimpl.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.22 $ * * This file is part of OpenOffice.org. * @@ -68,6 +68,7 @@ #include "pk11func.h" #ifdef SYSTEM_MOZILLA #include "nssrenam.h" +#include "secmod.h" #endif #include "cert.h" #include "cryptohi.h" @@ -104,6 +105,15 @@ bool nsscrypto_initialize( const char* token ) { printf("%s",error); return false ; } + +#ifdef SYSTEM_MOZILLA + if (!SECMOD_HasRootCerts()) + { + SECMOD_AddNewModule("Root Certs", "libnssckbi" SAL_DLLEXTENSION, + 0, 0); + } +#endif + initialized = 1 ; } -- cgit v1.2.3