diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-10-19 16:00:53 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-10-20 15:35:30 +0200 |
| commit | 41befa02bb4dbaf4a39ac41cbaaf12d10242e12e (patch) | |
| tree | cc380009aba5e9522826771898a2e3c1f355b0b6 | |
| parent | 4211f0eb60301bc18f82dea19f4e1cdf235efda6 (diff) | |
xmlsecurity: fix --without-system-nss usage of NSS_SetAlgorithmPolicy
The problem with commit ff572d9222ec16ffd679ae907a0bf4a8900265e1
is that it's using the wrong library; NSS_SetAlgorithmPolicy is actually
in libnssutil3.so.
This causes a linking problem when upgrading the internal NSS to a
version that has NSS_USE_ALG_IN_ANY_SIGNATURE.
Change-Id: I954d88062c38881bc721bdf052db4f7b55888aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123819
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 395c0c0bbaceadf909e0189af99c6358487c7978)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123848
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
| -rw-r--r-- | RepositoryExternal.mk | 26 | ||||
| -rw-r--r-- | xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk | 2 | ||||
| -rw-r--r-- | xmlsecurity/CppunitTest_xmlsecurity_signing.mk | 2 |
3 files changed, 28 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ea4fab6c87a7..e63b6fba6d0f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3427,6 +3427,11 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef +define gb_LinkTarget__use_nssutil3 +$(call gb_LinkTarget__use_nss3,$(1)) + +endef + define gb_LinkTarget__use_plc4 $(call gb_LinkTarget__use_nss3,$(1)) @@ -3496,6 +3501,27 @@ endif endef +define gb_LinkTarget__use_nssutil3 +$(call gb_LinkTarget_use_package,$(1),nss) +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss \ + -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include \ +) + +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nssutil3.lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \ + -lnssutil3 \ +) +endif + +endef + define gb_ExternalProject__use_nss3 $(call gb_ExternalProject_use_package,$(1),nss) diff --git a/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk b/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk index dbedd1a1f7c9..667acc97e3e1 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk @@ -37,7 +37,7 @@ $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_pdfsigning,\ ifneq ($(OS),WNT) ifneq (,$(ENABLE_NSS)) $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_pdfsigning,\ - nss3 \ + nssutil3 \ )) endif endif diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk index 8ab2d3014657..ef9dce397a8c 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk @@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_signing,\ ifneq ($(OS),WNT) ifneq (,$(ENABLE_NSS)) $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_signing,\ - nss3 \ + nssutil3 \ )) endif endif |