nssinitializer.cxx (6f51c329) | nssinitializer.cxx (5b11f0d3) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 281 unchanged lines hidden (view full) --- 290 291#ifdef XMLSEC_CRYPTO_NSS 292#if defined SYSTEM_MOZILLA 293 if (!SECMOD_HasRootCerts()) 294 { 295#endif 296 deleteRootsModule(); 297 | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 281 unchanged lines hidden (view full) --- 290 291#ifdef XMLSEC_CRYPTO_NSS 292#if defined SYSTEM_MOZILLA 293 if (!SECMOD_HasRootCerts()) 294 { 295#endif 296 deleteRootsModule(); 297 |
298#if defined SYSTEM_MOZILLA | 298#if defined OS2 299 // YD the nss system dlls names are ending with 'k' 300 OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "nssckbik" SAL_DLLEXTENSION)); 301#elif defined SYSTEM_MOZILLA |
299 OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION)); 300#else 301 OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION)); 302#endif 303 ::rtl::Bootstrap::expandMacros(rootModule); 304 305 OUString rootModulePath; 306 if (::osl::File::E_None == ::osl::File::getSystemPathFromFileURL(rootModule, rootModulePath)) --- 211 unchanged lines hidden --- | 302 OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION)); 303#else 304 OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION)); 305#endif 306 ::rtl::Bootstrap::expandMacros(rootModule); 307 308 OUString rootModulePath; 309 if (::osl::File::E_None == ::osl::File::getSystemPathFromFileURL(rootModule, rootModulePath)) --- 211 unchanged lines hidden --- |