Merge pull request #280 from ayakael/xmlsec-1.3.3-support

Add compatibility with  xmlsec 1.3.3

Author: jimjag

doc/source/modules/constants.rst

@@ -47,7 +47,7 @@ KeyData
 
    The DSA key klass.
 
-.. data:: xmlsec.constants.KeyDataEcdsa
+.. data:: xmlsec.constants.KeyDataEc
 
    The ECDSA key klass.
 

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")

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;
 

src/xmlsec/constants.pyi

@@ -29,7 +29,7 @@ EncNs: Final[str]
 KeyDataAes: Final[__KeyData]
 KeyDataDes: Final[__KeyData]
 KeyDataDsa: Final[__KeyData]
-KeyDataEcdsa: Final[__KeyData]
+KeyDataEc: Final[__KeyData]
 KeyDataEncryptedKey: Final[__KeyData]
 KeyDataFormatBinary: Final[int]
 KeyDataFormatCertDer: Final[int]