Skip to content

Commit 53436b3

Browse files
mehcodemehcode
committed
Merge pull request #17 from bgaifullin/master
Fixed work when libxmlsec1 was built with option --disable-crypto-dl
2 parents 2d94f93 + ac4dde4 commit 53436b3

File tree

13 files changed

+166
-150
lines changed

13 files changed

+166
-150
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
sudo: false
12
language: python
23
python:
34
- '2.7'
@@ -7,13 +8,12 @@ python:
78
addons:
89
apt:
910
packages:
10-
- libxslt1-dev
1111
- libssl-dev
12-
13-
# Not sure how to install a more recent version of this
14-
before_install:
15-
- travis_retry wget --no-check-certificate -O /dev/stdout http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.20.tar.gz | tar xzv
16-
- cd xmlsec1-1.2.20 && ./configure && make && sudo make install && sudo ldconfig && cd ..
12+
- libxmlsec1
13+
- libxmlsec1-dev
14+
- libxmlsec1-openssl
15+
- libxslt1-dev
16+
- pkg-config
1717

1818
install:
1919
- travis_retry pip install -e ".[test]"

‎setup.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bdist_rpm]
22
release = 1
3-
build-requires = pkgconfig xmlsec1-devel libxml2-devel xmlsec1-openssl-devel
3+
build-requires = pkg-config xmlsec1-devel libxml2-devel xmlsec1-openssl-devel
44
group = Development/Libraries
5-
requires = xmlsec1 xmlsec1-openssl
5+
requires = xmlsec1 xmlsec1-openssl

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def make_extension(name, cython=True):
5353
for lib in ['libxml-2.0', 'xmlsec1-%s' % xmlsec_crypto]:
5454
config.update(parse(lib))
5555

56-
config['extra_compile_args'] = ['-DXMLSEC_CRYPTO_OPENSSL=1']
56+
config['extra_compile_args'] = ['-DXMLSEC_CRYPTO_OPENSSL=1', '-DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING=1']
5757

5858
# List-ify config for setuptools.
5959
for key in config:

‎src/xmlsec.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#include <xmlsec/crypto.h>
21
#include <xmlsec/xmltree.h>
32
#include <xmlsec/xmldsig.h>
43
#include <xmlsec/xmlenc.h>
54
#include <xmlsec/templates.h>
65
#include <xmlsec/errors.h>
6+
#include <xmlsec/openssl/app.h>
7+
#include <xmlsec/openssl/crypto.h>

‎src/xmlsec/constants.pxd‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -54,65 +54,65 @@ cdef extern from "xmlsec.h": # xmlsec/strings.h
5454
xmlSecTransformUsageEncryptionMethod=0x0010
5555
xmlSecTransformUsageAny=0xFFFF
5656

57-
# Transform ids
57+
# Transform ids # xmlsec/app.h
5858
cdef struct _xmlSecTransformKlass:
5959
const_xmlChar* name
6060
const_xmlChar* href
6161
xmlSecTransformUsage usage
6262

6363
ctypedef _xmlSecTransformKlass *xmlSecTransformId
6464

65-
xmlSecTransformId xmlSecTransformInclC14NGetKlass()
66-
xmlSecTransformId xmlSecTransformInclC14NWithCommentsGetKlass()
67-
xmlSecTransformId xmlSecTransformInclC14N11GetKlass()
68-
xmlSecTransformId xmlSecTransformInclC14N11WithCommentsGetKlass()
69-
xmlSecTransformId xmlSecTransformExclC14NGetKlass()
70-
xmlSecTransformId xmlSecTransformExclC14NWithCommentsGetKlass()
71-
xmlSecTransformId xmlSecTransformEnvelopedGetKlass()
72-
xmlSecTransformId xmlSecTransformXPathGetKlass()
73-
xmlSecTransformId xmlSecTransformXPath2GetKlass()
74-
xmlSecTransformId xmlSecTransformXPointerGetKlass()
75-
xmlSecTransformId xmlSecTransformXsltGetKlass()
76-
xmlSecTransformId xmlSecTransformRemoveXmlTagsC14NGetKlass()
77-
xmlSecTransformId xmlSecTransformVisa3DHackGetKlass()
65+
xmlSecTransformId xmlSecTransformInclC14NGetKlass() nogil
66+
xmlSecTransformId xmlSecTransformInclC14NWithCommentsGetKlass() nogil
67+
xmlSecTransformId xmlSecTransformInclC14N11GetKlass() nogil
68+
xmlSecTransformId xmlSecTransformInclC14N11WithCommentsGetKlass() nogil
69+
xmlSecTransformId xmlSecTransformExclC14NGetKlass() nogil
70+
xmlSecTransformId xmlSecTransformExclC14NWithCommentsGetKlass() nogil
71+
xmlSecTransformId xmlSecTransformEnvelopedGetKlass() nogil
72+
xmlSecTransformId xmlSecTransformXPathGetKlass() nogil
73+
xmlSecTransformId xmlSecTransformXPath2GetKlass() nogil
74+
xmlSecTransformId xmlSecTransformXPointerGetKlass() nogil
75+
xmlSecTransformId xmlSecTransformXsltGetKlass() nogil
76+
xmlSecTransformId xmlSecTransformRemoveXmlTagsC14NGetKlass() nogil
77+
xmlSecTransformId xmlSecTransformVisa3DHackGetKlass() nogil
7878

79-
xmlSecTransformId xmlSecTransformAes128CbcGetKlass()
80-
xmlSecTransformId xmlSecTransformAes192CbcGetKlass()
81-
xmlSecTransformId xmlSecTransformAes256CbcGetKlass()
82-
xmlSecTransformId xmlSecTransformKWAes128GetKlass()
83-
xmlSecTransformId xmlSecTransformKWAes192GetKlass()
84-
xmlSecTransformId xmlSecTransformKWAes256GetKlass()
85-
xmlSecTransformId xmlSecTransformDes3CbcGetKlass()
86-
xmlSecTransformId xmlSecTransformKWDes3GetKlass()
87-
xmlSecTransformId xmlSecTransformDsaSha1GetKlass()
88-
xmlSecTransformId xmlSecTransformEcdsaSha1GetKlass()
89-
xmlSecTransformId xmlSecTransformEcdsaSha224GetKlass()
90-
xmlSecTransformId xmlSecTransformEcdsaSha256GetKlass()
91-
xmlSecTransformId xmlSecTransformEcdsaSha384GetKlass()
92-
xmlSecTransformId xmlSecTransformEcdsaSha512GetKlass()
93-
xmlSecTransformId xmlSecTransformHmacMd5GetKlass()
94-
xmlSecTransformId xmlSecTransformHmacRipemd160GetKlass()
95-
xmlSecTransformId xmlSecTransformHmacSha1GetKlass()
96-
xmlSecTransformId xmlSecTransformHmacSha224GetKlass()
97-
xmlSecTransformId xmlSecTransformHmacSha256GetKlass()
98-
xmlSecTransformId xmlSecTransformHmacSha384GetKlass()
99-
xmlSecTransformId xmlSecTransformHmacSha512GetKlass()
100-
xmlSecTransformId xmlSecTransformMd5GetKlass()
101-
xmlSecTransformId xmlSecTransformRipemd160GetKlass()
102-
xmlSecTransformId xmlSecTransformRsaMd5GetKlass()
103-
xmlSecTransformId xmlSecTransformRsaRipemd160GetKlass()
104-
xmlSecTransformId xmlSecTransformRsaSha1GetKlass()
105-
xmlSecTransformId xmlSecTransformRsaSha224GetKlass()
106-
xmlSecTransformId xmlSecTransformRsaSha256GetKlass()
107-
xmlSecTransformId xmlSecTransformRsaSha384GetKlass()
108-
xmlSecTransformId xmlSecTransformRsaSha512GetKlass()
109-
xmlSecTransformId xmlSecTransformRsaPkcs1GetKlass()
110-
xmlSecTransformId xmlSecTransformRsaOaepGetKlass()
111-
xmlSecTransformId xmlSecTransformSha1GetKlass()
112-
xmlSecTransformId xmlSecTransformSha224GetKlass()
113-
xmlSecTransformId xmlSecTransformSha256GetKlass()
114-
xmlSecTransformId xmlSecTransformSha384GetKlass()
115-
xmlSecTransformId xmlSecTransformSha512GetKlass()
79+
xmlSecTransformId xmlSecOpenSSLTransformAes128CbcGetKlass() nogil
80+
xmlSecTransformId xmlSecOpenSSLTransformAes192CbcGetKlass() nogil
81+
xmlSecTransformId xmlSecOpenSSLTransformAes256CbcGetKlass() nogil
82+
xmlSecTransformId xmlSecOpenSSLTransformKWAes128GetKlass() nogil
83+
xmlSecTransformId xmlSecOpenSSLTransformKWAes192GetKlass() nogil
84+
xmlSecTransformId xmlSecOpenSSLTransformKWAes256GetKlass() nogil
85+
xmlSecTransformId xmlSecOpenSSLTransformDes3CbcGetKlass() nogil
86+
xmlSecTransformId xmlSecOpenSSLTransformKWDes3GetKlass() nogil
87+
xmlSecTransformId xmlSecOpenSSLTransformDsaSha1GetKlass() nogil
88+
# xmlSecTransformId xmlSecOpenSSLTransformEcdsaSha1GetKlass() nogil
89+
# xmlSecTransformId xmlSecOpenSSLTransformEcdsaSha224GetKlass() nogil
90+
# xmlSecTransformId xmlSecOpenSSLTransformEcdsaSha256GetKlass() nogil
91+
# xmlSecTransformId xmlSecOpenSSLTransformEcdsaSha384GetKlass() nogil
92+
# xmlSecTransformId xmlSecOpenSSLTransformEcdsaSha512GetKlass() nogil
93+
xmlSecTransformId xmlSecOpenSSLTransformHmacMd5GetKlass() nogil
94+
xmlSecTransformId xmlSecOpenSSLTransformHmacRipemd160GetKlass() nogil
95+
xmlSecTransformId xmlSecOpenSSLTransformHmacSha1GetKlass() nogil
96+
xmlSecTransformId xmlSecOpenSSLTransformHmacSha224GetKlass() nogil
97+
xmlSecTransformId xmlSecOpenSSLTransformHmacSha256GetKlass() nogil
98+
xmlSecTransformId xmlSecOpenSSLTransformHmacSha384GetKlass() nogil
99+
xmlSecTransformId xmlSecOpenSSLTransformHmacSha512GetKlass() nogil
100+
xmlSecTransformId xmlSecOpenSSLTransformMd5GetKlass() nogil
101+
xmlSecTransformId xmlSecOpenSSLTransformRipemd160GetKlass() nogil
102+
xmlSecTransformId xmlSecOpenSSLTransformRsaMd5GetKlass() nogil
103+
xmlSecTransformId xmlSecOpenSSLTransformRsaRipemd160GetKlass() nogil
104+
xmlSecTransformId xmlSecOpenSSLTransformRsaSha1GetKlass() nogil
105+
xmlSecTransformId xmlSecOpenSSLTransformRsaSha224GetKlass() nogil
106+
xmlSecTransformId xmlSecOpenSSLTransformRsaSha256GetKlass() nogil
107+
xmlSecTransformId xmlSecOpenSSLTransformRsaSha384GetKlass() nogil
108+
xmlSecTransformId xmlSecOpenSSLTransformRsaSha512GetKlass() nogil
109+
xmlSecTransformId xmlSecOpenSSLTransformRsaPkcs1GetKlass() nogil
110+
xmlSecTransformId xmlSecOpenSSLTransformRsaOaepGetKlass() nogil
111+
xmlSecTransformId xmlSecOpenSSLTransformSha1GetKlass() nogil
112+
xmlSecTransformId xmlSecOpenSSLTransformSha224GetKlass() nogil
113+
xmlSecTransformId xmlSecOpenSSLTransformSha256GetKlass() nogil
114+
xmlSecTransformId xmlSecOpenSSLTransformSha384GetKlass() nogil
115+
xmlSecTransformId xmlSecOpenSSLTransformSha512GetKlass() nogil
116116

117117

118118
cdef class _Transform(object):

‎src/xmlsec/constants.pyx‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -93,40 +93,40 @@ class Transform:
9393
REMOVE_XML_TAGS_C14N = _mkti(xmlSecTransformRemoveXmlTagsC14NGetKlass())
9494
VISA3D_HACK = _mkti(xmlSecTransformVisa3DHackGetKlass())
9595

96-
AES128 = _mkti(xmlSecTransformAes128CbcGetKlass())
97-
AES192 = _mkti(xmlSecTransformAes192CbcGetKlass())
98-
AES256 = _mkti(xmlSecTransformAes256CbcGetKlass())
99-
KW_AES128 = _mkti(xmlSecTransformKWAes128GetKlass())
100-
KW_AES192 = _mkti(xmlSecTransformKWAes192GetKlass())
101-
KW_AES256 = _mkti(xmlSecTransformKWAes256GetKlass())
102-
DES3 = _mkti(xmlSecTransformDes3CbcGetKlass())
103-
KW_DES3 = _mkti(xmlSecTransformKWDes3GetKlass())
104-
DSA_SHA1 = _mkti(xmlSecTransformDsaSha1GetKlass())
105-
ECDSA_SHA1 = _mkti(xmlSecTransformEcdsaSha1GetKlass())
106-
ECDSA_SHA224 = _mkti(xmlSecTransformEcdsaSha224GetKlass())
107-
ECDSA_SHA256 = _mkti(xmlSecTransformEcdsaSha256GetKlass())
108-
ECDSA_SHA384 = _mkti(xmlSecTransformEcdsaSha384GetKlass())
109-
ECDSA_SHA512 = _mkti(xmlSecTransformEcdsaSha512GetKlass())
110-
HMAC_MD5 = _mkti(xmlSecTransformHmacMd5GetKlass())
111-
HMAC_RIPEMD160 = _mkti(xmlSecTransformHmacRipemd160GetKlass())
112-
HMAC_SHA1 = _mkti(xmlSecTransformHmacSha1GetKlass())
113-
HMAC_SHA224 = _mkti(xmlSecTransformHmacSha224GetKlass())
114-
HMAC_SHA256 = _mkti(xmlSecTransformHmacSha256GetKlass())
115-
HMAC_SHA384 = _mkti(xmlSecTransformHmacSha384GetKlass())
116-
HMAC_SHA512 = _mkti(xmlSecTransformHmacSha512GetKlass())
117-
MD5 = _mkti(xmlSecTransformMd5GetKlass())
118-
RIPEMD160 = _mkti(xmlSecTransformRipemd160GetKlass())
119-
RSA_MD5 = _mkti(xmlSecTransformRsaMd5GetKlass())
120-
RSA_RIPEMD160 = _mkti(xmlSecTransformRsaRipemd160GetKlass())
121-
RSA_SHA1 = _mkti(xmlSecTransformRsaSha1GetKlass())
122-
RSA_SHA224 = _mkti(xmlSecTransformRsaSha224GetKlass())
123-
RSA_SHA256 = _mkti(xmlSecTransformRsaSha256GetKlass())
124-
RSA_SHA384 = _mkti(xmlSecTransformRsaSha384GetKlass())
125-
RSA_SHA512 = _mkti(xmlSecTransformRsaSha512GetKlass())
126-
RSA_PKCS1 = _mkti(xmlSecTransformRsaPkcs1GetKlass())
127-
RSA_OAEP = _mkti(xmlSecTransformRsaOaepGetKlass())
128-
SHA1 = _mkti(xmlSecTransformSha1GetKlass())
129-
SHA224 = _mkti(xmlSecTransformSha224GetKlass())
130-
SHA256 = _mkti(xmlSecTransformSha256GetKlass())
131-
SHA384 = _mkti(xmlSecTransformSha384GetKlass())
132-
SHA512 = _mkti(xmlSecTransformSha512GetKlass())
96+
AES128 = _mkti(xmlSecOpenSSLTransformAes128CbcGetKlass())
97+
AES192 = _mkti(xmlSecOpenSSLTransformAes192CbcGetKlass())
98+
AES256 = _mkti(xmlSecOpenSSLTransformAes256CbcGetKlass())
99+
KW_AES128 = _mkti(xmlSecOpenSSLTransformKWAes128GetKlass())
100+
KW_AES192 = _mkti(xmlSecOpenSSLTransformKWAes192GetKlass())
101+
KW_AES256 = _mkti(xmlSecOpenSSLTransformKWAes256GetKlass())
102+
DES3 = _mkti(xmlSecOpenSSLTransformDes3CbcGetKlass())
103+
KW_DES3 = _mkti(xmlSecOpenSSLTransformKWDes3GetKlass())
104+
DSA_SHA1 = _mkti(xmlSecOpenSSLTransformDsaSha1GetKlass())
105+
# ECDSA_SHA1 = _mkti(xmlSecOpenSSLTransformEcdsaSha1GetKlass())
106+
# ECDSA_SHA224 = _mkti(xmlSecOpenSSLTransformEcdsaSha224GetKlass())
107+
# ECDSA_SHA256 = _mkti(xmlSecOpenSSLTransformEcdsaSha256GetKlass())
108+
# ECDSA_SHA384 = _mkti(xmlSecOpenSSLTransformEcdsaSha384GetKlass())
109+
# ECDSA_SHA512 = _mkti(xmlSecOpenSSLTransformEcdsaSha512GetKlass())
110+
HMAC_MD5 = _mkti(xmlSecOpenSSLTransformHmacMd5GetKlass())
111+
HMAC_RIPEMD160 = _mkti(xmlSecOpenSSLTransformHmacRipemd160GetKlass())
112+
HMAC_SHA1 = _mkti(xmlSecOpenSSLTransformHmacSha1GetKlass())
113+
HMAC_SHA224 = _mkti(xmlSecOpenSSLTransformHmacSha224GetKlass())
114+
HMAC_SHA256 = _mkti(xmlSecOpenSSLTransformHmacSha256GetKlass())
115+
HMAC_SHA384 = _mkti(xmlSecOpenSSLTransformHmacSha384GetKlass())
116+
HMAC_SHA512 = _mkti(xmlSecOpenSSLTransformHmacSha512GetKlass())
117+
MD5 = _mkti(xmlSecOpenSSLTransformMd5GetKlass())
118+
RIPEMD160 = _mkti(xmlSecOpenSSLTransformRipemd160GetKlass())
119+
RSA_MD5 = _mkti(xmlSecOpenSSLTransformRsaMd5GetKlass())
120+
RSA_RIPEMD160 = _mkti(xmlSecOpenSSLTransformRsaRipemd160GetKlass())
121+
RSA_SHA1 = _mkti(xmlSecOpenSSLTransformRsaSha1GetKlass())
122+
RSA_SHA224 = _mkti(xmlSecOpenSSLTransformRsaSha224GetKlass())
123+
RSA_SHA256 = _mkti(xmlSecOpenSSLTransformRsaSha256GetKlass())
124+
RSA_SHA384 = _mkti(xmlSecOpenSSLTransformRsaSha384GetKlass())
125+
RSA_SHA512 = _mkti(xmlSecOpenSSLTransformRsaSha512GetKlass())
126+
RSA_PKCS1 = _mkti(xmlSecOpenSSLTransformRsaPkcs1GetKlass())
127+
RSA_OAEP = _mkti(xmlSecOpenSSLTransformRsaOaepGetKlass())
128+
SHA1 = _mkti(xmlSecOpenSSLTransformSha1GetKlass())
129+
SHA224 = _mkti(xmlSecOpenSSLTransformSha224GetKlass())
130+
SHA256 = _mkti(xmlSecOpenSSLTransformSha256GetKlass())
131+
SHA384 = _mkti(xmlSecOpenSSLTransformSha384GetKlass())
132+
SHA512 = _mkti(xmlSecOpenSSLTransformSha512GetKlass())

‎src/xmlsec/key.pxd‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ cdef extern from "xmlsec.h": # xmlsec/keys.h
1414

1515
ctypedef _xmlSecKeyDataKlass *xmlSecKeyDataId
1616

17-
xmlSecKeyDataId xmlSecKeyDataNameGetKlass()
18-
xmlSecKeyDataId xmlSecKeyDataValueGetKlass()
19-
xmlSecKeyDataId xmlSecKeyDataRetrievalMethodGetKlass()
20-
xmlSecKeyDataId xmlSecKeyDataEncryptedKeyGetKlass()
21-
xmlSecKeyDataId xmlSecKeyDataAesGetKlass()
22-
xmlSecKeyDataId xmlSecKeyDataDesGetKlass()
23-
xmlSecKeyDataId xmlSecKeyDataDsaGetKlass()
24-
xmlSecKeyDataId xmlSecKeyDataEcdsaGetKlass()
25-
xmlSecKeyDataId xmlSecKeyDataHmacGetKlass()
26-
xmlSecKeyDataId xmlSecKeyDataRsaGetKlass()
27-
xmlSecKeyDataId xmlSecKeyDataX509GetKlass()
28-
xmlSecKeyDataId xmlSecKeyDataRawX509CertGetKlass()
17+
xmlSecKeyDataId xmlSecKeyDataNameGetKlass() nogil
18+
xmlSecKeyDataId xmlSecKeyDataValueGetKlass() nogil
19+
xmlSecKeyDataId xmlSecKeyDataRetrievalMethodGetKlass() nogil
20+
xmlSecKeyDataId xmlSecKeyDataEncryptedKeyGetKlass() nogil
21+
xmlSecKeyDataId xmlSecOpenSSLKeyDataAesGetKlass() nogil
22+
xmlSecKeyDataId xmlSecOpenSSLKeyDataDesGetKlass() nogil
23+
xmlSecKeyDataId xmlSecOpenSSLKeyDataDsaGetKlass() nogil
24+
# xmlSecKeyDataId xmlSecOpenSSLKeyDataEcdsaGetKlass() nogil
25+
xmlSecKeyDataId xmlSecOpenSSLKeyDataHmacGetKlass() nogil
26+
xmlSecKeyDataId xmlSecOpenSSLKeyDataRsaGetKlass() nogil
27+
xmlSecKeyDataId xmlSecOpenSSLKeyDataX509GetKlass() nogil
28+
xmlSecKeyDataId xmlSecOpenSSLKeyDataRawX509CertGetKlass() nogil
2929

3030
ctypedef enum xmlSecKeyDataFormat:
3131
xmlSecKeyDataFormatUnknown = 0
@@ -63,10 +63,10 @@ cdef extern from "xmlsec.h": # xmlsec/keys.h
6363

6464
xmlSecKeyPtr xmlSecKeyDuplicate(xmlSecKeyPtr) nogil
6565

66-
xmlSecKeyPtr xmlSecCryptoAppKeyLoad(
66+
xmlSecKeyPtr xmlSecOpenSSLAppKeyLoad(
6767
const_char*, xmlSecKeyDataFormat, const_char*, void*, void *) nogil
6868

69-
xmlSecKeyPtr xmlSecCryptoAppKeyLoadMemory(
69+
xmlSecKeyPtr xmlSecOpenSSLAppKeyLoadMemory(
7070
const_unsigned_char*, int, xmlSecKeyDataFormat,
7171
const_char*, void*, void*) nogil
7272

@@ -75,10 +75,10 @@ cdef extern from "xmlsec.h": # xmlsec/keys.h
7575
# xmlSecKeyPtr xmlSecKeyReadMemory(
7676
# xmlSecKeyDataId, const_unsigned_char*, size_t) nogil
7777

78-
int xmlSecCryptoAppKeyCertLoad(
78+
int xmlSecOpenSSLAppKeyCertLoad(
7979
xmlSecKeyPtr, const_char*, xmlSecKeyDataFormat) nogil
8080

81-
int xmlSecCryptoAppKeyCertLoadMemory(
81+
int xmlSecOpenSSLAppKeyCertLoadMemory(
8282
xmlSecKeyPtr, const_unsigned_char*, int, xmlSecKeyDataFormat) nogil
8383

8484
xmlSecKeyPtr xmlSecKeyGenerate(
@@ -96,14 +96,14 @@ cdef extern from "xmlsec.h": # xmlsec/keys.h
9696

9797
void xmlSecKeysMngrDestroy(xmlSecKeysMngrPtr) nogil
9898

99-
int xmlSecCryptoAppDefaultKeysMngrInit(xmlSecKeysMngrPtr) nogil
99+
int xmlSecOpenSSLAppDefaultKeysMngrInit(xmlSecKeysMngrPtr) nogil
100100

101-
int xmlSecCryptoAppDefaultKeysMngrAdoptKey(xmlSecKeysMngrPtr, xmlSecKeyPtr) nogil
101+
int xmlSecOpenSSLAppDefaultKeysMngrAdoptKey(xmlSecKeysMngrPtr, xmlSecKeyPtr) nogil
102102

103-
int xmlSecCryptoAppKeysMngrCertLoad(
103+
int xmlSecOpenSSLAppKeysMngrCertLoad(
104104
xmlSecKeysMngrPtr, char * filename, xmlSecKeyDataFormat, xmlSecKeyDataType) nogil
105105

106-
int xmlSecCryptoAppKeysMngrCertLoadMemory(
106+
int xmlSecOpenSSLAppKeysMngrCertLoadMemory(
107107
xmlSecKeysMngrPtr, const_unsigned_char *, size_t, xmlSecKeyDataFormat, xmlSecKeyDataType) nogil
108108

109109

0 commit comments

Comments
 (0)