Attachment #165818 for bug #206234

Lines 42-47 Link Here

(-)xmlsecurity/source/xmlsec/nss/makefile.mk (+4 lines)
42	@echo "No nss -> no libxmlsec -> no xmlsecurity/nss"	42	@echo "No nss -> no libxmlsec -> no xmlsecurity/nss"
43	.ENDIF	43	.ENDIF
44		44
		45	.IF "$(SYSTEM_NSS)" == "YES"
		46	CFLAGS+=-DSYSTEM_NSS
		47	.ENDIF
		48
45	.IF "$(SYSTEM_NSS)" != "YES"	49	.IF "$(SYSTEM_NSS)" != "YES"
46	MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla	50	MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
47	NSS_CFLAGS = -I$(MOZ_INC)$/nss	51	NSS_CFLAGS = -I$(MOZ_INC)$/nss




//the location of the roots module to the profile, which makes FF2 and TB2 use
//it instead of there own module.
//
//When using SYSTEM_NSS then the libnss3.so lib is typically found in
///usr/lib. This folder may, however, NOT contain the roots certificate
//module. That is, just providing the library name in SECMOD_LoadUserModule or
//SECMOD_AddNewModule will FAIL to load the mozilla unless the LD_LIBRARY_PATH

    out_nss_init = true;
    
#ifdef XMLSEC_CRYPTO_NSS
#if defined SYSTEM_NSS
    if (!SECMOD_HasRootCerts())
    {
#endif

#if defined OS2
        // YD the nss system dlls names are ending with 'k'
        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "nssckbik" SAL_DLLEXTENSION));
#elif defined SYSTEM_NSS
        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));
#else
        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));

            xmlsec_trace("Adding new root certificate module failed.");
            return_value = false;
        }
#if SYSTEM_NSS
    }
#endif
#endif

Lines 123-131 Link Here

(-)extensions/source/mozbootstrap/MNSProfileDiscover.cxx (-1 / +6 lines)
123	{	123	{
124	isRelative = sIsRelative.toInt32();	124	isRelative = sIsRelative.toInt32();
125	}	125	}
		126	if (isRelative)
		127	{
		128	// Make it absolute
		129	profilePath = regDir + profilePath;
		130	}
126		131
127	ProfileStruct* profileItem = new ProfileStruct(product,profileName,	132	ProfileStruct* profileItem = new ProfileStruct(product,profileName,
128	regDir + profilePath);	133	profilePath);
129	m_Product.mProfileList[profileName] = profileItem;	134	m_Product.mProfileList[profileName] = profileItem;
130		135
131	sal_Int32 isDefault = 0;	136	sal_Int32 isDefault = 0;

Return to bug 206234

Lines 234-240 Link Here

(-)xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (-4 / +4 lines)
234	//the location of the roots module to the profile, which makes FF2 and TB2 use	234	//the location of the roots module to the profile, which makes FF2 and TB2 use
235	//it instead of there own module.	235	//it instead of there own module.
236	//	236	//
237	//When using SYSTEM_MOZILLA then the libnss3.so lib is typically found in	237	//When using SYSTEM_NSS then the libnss3.so lib is typically found in
238	///usr/lib. This folder may, however, NOT contain the roots certificate	238	///usr/lib. This folder may, however, NOT contain the roots certificate
239	//module. That is, just providing the library name in SECMOD_LoadUserModule or	239	//module. That is, just providing the library name in SECMOD_LoadUserModule or
240	//SECMOD_AddNewModule will FAIL to load the mozilla unless the LD_LIBRARY_PATH	240	//SECMOD_AddNewModule will FAIL to load the mozilla unless the LD_LIBRARY_PATH
Lines 289-295 Link Here
289	out_nss_init = true;	289	out_nss_init = true;
290		290
291	#ifdef XMLSEC_CRYPTO_NSS	291	#ifdef XMLSEC_CRYPTO_NSS
292	#if defined SYSTEM_MOZILLA	292	#if defined SYSTEM_NSS
293	if (!SECMOD_HasRootCerts())	293	if (!SECMOD_HasRootCerts())
294	{	294	{
295	#endif	295	#endif
Lines 298-304 Link Here
298	#if defined OS2	298	#if defined OS2
299	// YD the nss system dlls names are ending with 'k'	299	// YD the nss system dlls names are ending with 'k'
300	OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "nssckbik" SAL_DLLEXTENSION));	300	OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "nssckbik" SAL_DLLEXTENSION));
301	#elif defined SYSTEM_MOZILLA	301	#elif defined SYSTEM_NSS
302	OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));	302	OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));
303	#else	303	#else
304	OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));	304	OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
Lines 352-358 Link Here
352	xmlsec_trace("Adding new root certificate module failed.");	352	xmlsec_trace("Adding new root certificate module failed.");
353	return_value = false;	353	return_value = false;
354	}	354	}
355	#if SYSTEM_MOZILLA	355	#if SYSTEM_NSS
356	}	356	}
357	#endif	357	#endif
358	#endif	358	#endif