xmlsecurity/Library_xmlsecurity.mk | 11 ++++++++--- xmlsecurity/Module_xmlsecurity.mk | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit 1c6382b2564fbf19f8ee99e11021dff2ce19ed6f Author: Jan-Marek Glogowski <glo...@fbihome.de> AuthorDate: Wed May 19 06:52:55 2021 +0200 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Sun Aug 1 21:46:36 2021 +0200 xmlsec: handle missing EqualDistinguishedNames This is just a hack. A more correct fix would be to condition the whole xmlsecurity support in the various LO modules. The non-NSS build now fails, because it misses the EqualDistinguishedNames, which is non-trivial to implement. This is the consequence of commit 1d3da3486d827dd5e7a3bf1c7a533f5aa9860e42 "xmlsecurity: add EqualDistinguishedNames()" and commit 5af5ea893bcb8a8eb472ac11133da10e5a604e66 "xmlsecurity: improve handling of multiple certificates per X509Data". FWIW: one could also use OpenSSL i2d_X509_NAME and X509_NAME_cmp to implement this functionality, but it looks like it requires some ANS.1 input to begin with (maybe i2s_ASN1_* can be used). And then you would still miss some certificate store integration. Change-Id: I0600f76a5cb4379db428f67cb136b8567dfcc51e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116123 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index 3e9bac3b5b9f..9d6862e8d6ec 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\ xmlsecurity/source/component/certificatecontainer \ - xmlsecurity/source/component/documentdigitalsignatures \ xmlsecurity/source/dialogs/certificatechooser \ xmlsecurity/source/dialogs/certificateviewer \ xmlsecurity/source/dialogs/digitalsignaturesdialog \ @@ -68,14 +67,20 @@ $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\ xmlsecurity/source/helper/ooxmlsecparser \ xmlsecurity/source/helper/ooxmlsecexporter \ xmlsecurity/source/helper/pdfsignaturehelper \ - xmlsecurity/source/helper/xmlsignaturehelper \ xmlsecurity/source/helper/UriBindingHelper \ xmlsecurity/source/helper/xsecctl \ xmlsecurity/source/helper/xsecparser \ xmlsecurity/source/helper/xsecsign \ - xmlsecurity/source/helper/xsecverify \ )) +ifneq (,$(or $(ENABLE_NSS),$(filter WNT,$(OS)))) +$(eval $(call gb_Library_add_exception_objects,xmlsecurity,\ + xmlsecurity/source/component/documentdigitalsignatures \ + xmlsecurity/source/helper/xmlsignaturehelper \ + xmlsecurity/source/helper/xsecverify \ +)) +endif + $(eval $(call gb_Library_use_externals,xmlsecurity,\ libxml2 \ )) diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index 2a6db1c4f74e..d911b16c6438 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -38,9 +38,11 @@ $(eval $(call gb_Module_add_screenshot_targets,xmlsecurity,\ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifneq (,$(or $(ENABLE_NSS),$(filter WNT,$(OS)))) $(eval $(call gb_Module_add_targets,xmlsecurity,\ Executable_pdfverify \ )) endif +endif # vim: set noet sw=4 ts=4: