download.lst |
4 -
external/xmlsec/UnpackedTarball_xmlsec.mk |
2
external/xmlsec/xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1 |
33 ----------
3 files changed, 2 insertions(+), 37 deletions(-)
New commits:
commit 1651ced348fa47de3f24650dcad8922121602da4
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Apr 12 08:36:05 2024 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Apr 15 08:03:11 2024 +0200
Update libxmlsec to 1.3.4
Allows dropping
xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1, which was
a backport.
Change-Id: Ifdd0b5285daa79116a91ab2d122a9809f8effb5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166019
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/download.lst b/download.lst
index d8793dbeb620..f36b5fe0da10 100644
--- a/download.lst
+++ b/download.lst
@@ -419,8 +419,8 @@ LIBWEBP_TARBALL := libwebp-1.3.2.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-XMLSEC_SHA256SUM :=
ab5b9a9ffd6960f46f7466d9d91f174ec37e8c31989237ba6b9eacdd816464f2
-XMLSEC_TARBALL := xmlsec1-1.3.3.tar.gz
+XMLSEC_SHA256SUM :=
45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75
+XMLSEC_TARBALL := xmlsec1-1.3.4.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk
b/external/xmlsec/UnpackedTarball_xmlsec.mk
index ad7b4b57c5f3..906aece5f7ed 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -12,8 +12,6 @@ xmlsec_patches :=
xmlsec_patches += old-nss.patch.1
# Remove this when Windows 7 is no longer supported
xmlsec_patches += BCryptKeyDerivation.patch.1
-# Backport of https://github.com/lsh123/xmlsec/pull/754
-xmlsec_patches += xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1
$(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
diff --git
a/external/xmlsec/xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1
b/external/xmlsec/xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1
deleted file mode 100644
index bf397bfb9178..000000000000
---
a/external/xmlsec/xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1
+++ /dev/null
@@ -1,33 +0,0 @@
-From 356fdcfaf6e126835ac3bd7f410a3fa4d4a6877b Mon Sep 17 00:00:00 2001
-From: lsh123 <alek...@aleksey.com>
-Date: Sat, 13 Jan 2024 18:07:49 -0500
-Subject: [PATCH] (xmlsec-nss) Ensure NSS algorithms are initialized (#754)
-
----
- src/nss/crypto.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/nss/crypto.c b/src/nss/crypto.c
-index 6455ec72..7ba0c77a 100644
---- a/src/nss/crypto.c
-+++ b/src/nss/crypto.c
-@@ -361,8 +361,16 @@ xmlSecCryptoGetFunctions_nss(void) {
-
- static void
- xmlSecNssUpdateAvailableCryptoTransforms(xmlSecCryptoDLFunctionsPtr
functions) {
-+ SECStatus rv;
- xmlSecAssert(functions != NULL);
-
-+ /* in theory NSS should be already initialized but just in case */
-+ rv = SECOID_Init();
-+ if (rv != SECSuccess) {
-+ xmlSecNssError("SECOID_Init", NULL);
-+ return;
-+ }
-+
- /******************************* AES ********************************/
- /* cbc */
- if (xmlSecNssCryptoCheckAlgorithm(SEC_OID_AES_128_CBC) == 0) {
---
-2.35.3
-
