From 7dc2d5f5f5cd0e20fdf538295023e9ddc116a0b1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 13 Jan 2024 19:40:05 -0500 Subject: [PATCH 1/4] src/constants.c: use KeyDataEc rather than KetDataEcdsa --- src/constants.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants.c b/src/constants.c index 34c81b29..3e698e83 100644 --- a/src/constants.c +++ b/src/constants.c @@ -447,7 +447,7 @@ int PyXmlSec_ConstantsModule_Init(PyObject* package) { #endif #if XMLSEC_VERSION_HEX > 0x10212 // from version 1.2.19 - PYXMLSEC_ADD_KEYDATA_CONSTANT(KeyDataEcdsa, "ECDSA") + PYXMLSEC_ADD_KEYDATA_CONSTANT(KeyDataEc, "ECDSA") #endif PYXMLSEC_ADD_KEYDATA_CONSTANT(KeyDataHmac, "HMAC") PYXMLSEC_ADD_KEYDATA_CONSTANT(KeyDataRsa, "RSA") From 7b573378854883ffca6b089639989ea908ac796a Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 13 Jan 2024 19:40:28 -0500 Subject: [PATCH 2/4] Use xmlSecCryptoAppKeyLoadEx instead of xmlSecCryptoAppKeyLoad --- src/keys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keys.c b/src/keys.c index 1362b128..47678a53 100644 --- a/src/keys.c +++ b/src/keys.c @@ -163,7 +163,7 @@ static PyObject* PyXmlSec_KeyFromFile(PyObject* self, PyObject* args, PyObject* if (is_content) { key->handle = xmlSecCryptoAppKeyLoadMemory((const xmlSecByte*)data, (xmlSecSize)data_size, format, password, NULL, NULL); } else { - key->handle = xmlSecCryptoAppKeyLoad(data, format, password, NULL, NULL); + key->handle = xmlSecCryptoAppKeyLoadEx(data, xmlSecKeyDataTypePrivate, format, password, NULL, NULL); } Py_END_ALLOW_THREADS; From b047c62a140ff741eb3fc176f489920e16e3a504 Mon Sep 17 00:00:00 2001 From: Sebastian Brannstrom Date: Sat, 2 Mar 2024 06:49:35 +0100 Subject: [PATCH 3/4] turn off MD5 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 489844c8..c8a7fe49 100644 --- a/setup.py +++ b/setup.py @@ -470,6 +470,7 @@ def prepare_static_build_linux(self): ('XMLSEC_NO_CRYPTO_DYNAMIC_LOADING', '1'), ('XMLSEC_CRYPTO_OPENSSL', '1'), ('LIBXML_ICONV_ENABLED', 1), + ('XMLSEC_NO_MD5', '0'), ('LIBXML_STATIC', '1'), ('LIBXSLT_STATIC', '1'), ('XMLSEC_STATIC', '1'), From 43138c354f0744933b5c2f6ff02c9069a132ff07 Mon Sep 17 00:00:00 2001 From: Sebastian Brannstrom Date: Sat, 2 Mar 2024 07:14:01 +0100 Subject: [PATCH 4/4] set version number --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index c8a7fe49..a739f774 100644 --- a/setup.py +++ b/setup.py @@ -509,6 +509,7 @@ def prepare_static_build_linux(self): setup( name='xmlsec', + version='1.3.9', use_scm_version=True, description='Python bindings for the XML Security Library', long_description=long_desc,