Merge pull request xmlsec#3 from jgiannuzzi/ecdsa

mehcode · mehcode · commit 89107b5ea8b6 · 2015-06-09T14:02:41.000-07:00
Add ECDSA support
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,10 @@ python:
 
 before_install:
   - 'travis_retry sudo apt-get update'
-  - 'travis_retry sudo apt-get install --fix-missing -y python-dev libxml2-dev libxmlsec1-dev'
+  - 'travis_retry sudo apt-get install --fix-missing -y python-dev libxslt1-dev libssl-dev'
   - 'travis_retry pip install Cython --use-mirrors'
+  - 'travis_retry wget -O /dev/stdout https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.20.tar.gz | tar xzv'
+  - 'cd xmlsec1-1.2.20 && ./configure && make && sudo make install && sudo ldconfig && cd ..'
 
 install:
   - 'travis_retry pip install -e ".[test]" --use-mirrors'
diff --git a/src/xmlsec/constants.pxd b/src/xmlsec/constants.pxd
@@ -85,6 +85,11 @@ cdef extern from "xmlsec.h":  # xmlsec/strings.h
     xmlSecTransformId xmlSecTransformDes3CbcId
     xmlSecTransformId xmlSecTransformKWDes3Id
     xmlSecTransformId xmlSecTransformDsaSha1Id
+    xmlSecTransformId xmlSecTransformEcdsaSha1Id
+    xmlSecTransformId xmlSecTransformEcdsaSha224Id
+    xmlSecTransformId xmlSecTransformEcdsaSha256Id
+    xmlSecTransformId xmlSecTransformEcdsaSha384Id
+    xmlSecTransformId xmlSecTransformEcdsaSha512Id
     xmlSecTransformId xmlSecTransformHmacMd5Id
     xmlSecTransformId xmlSecTransformHmacRipemd160Id
     xmlSecTransformId xmlSecTransformHmacSha1Id
diff --git a/src/xmlsec/constants.pyx b/src/xmlsec/constants.pyx
@@ -102,6 +102,11 @@ class Transform:
     DES3 = _mkti(xmlSecTransformDes3CbcId)
     KW_DES3 = _mkti(xmlSecTransformKWDes3Id)
     DSA_SHA1 = _mkti(xmlSecTransformDsaSha1Id)
+    ECDSA_SHA1 = _mkti(xmlSecTransformEcdsaSha1Id)
+    ECDSA_SHA224 = _mkti(xmlSecTransformEcdsaSha224Id)
+    ECDSA_SHA256 = _mkti(xmlSecTransformEcdsaSha256Id)
+    ECDSA_SHA384 = _mkti(xmlSecTransformEcdsaSha384Id)
+    ECDSA_SHA512 = _mkti(xmlSecTransformEcdsaSha512Id)
     HMAC_MD5 = _mkti(xmlSecTransformHmacMd5Id)
     HMAC_RIPEMD160 = _mkti(xmlSecTransformHmacRipemd160Id)
     HMAC_SHA1 = _mkti(xmlSecTransformHmacSha1Id)
diff --git a/src/xmlsec/key.pxd b/src/xmlsec/key.pxd
@@ -21,6 +21,7 @@ cdef extern from "xmlsec.h":  # xmlsec/keys.h
     xmlSecKeyDataId xmlSecKeyDataAesId
     xmlSecKeyDataId xmlSecKeyDataDesId
     xmlSecKeyDataId xmlSecKeyDataDsaId
+    xmlSecKeyDataId xmlSecKeyDataEcdsaId
     xmlSecKeyDataId xmlSecKeyDataHmacId
     xmlSecKeyDataId xmlSecKeyDataRsaId
     xmlSecKeyDataId xmlSecKeyDataX509Id
diff --git a/src/xmlsec/key.pyx b/src/xmlsec/key.pyx
@@ -51,6 +51,7 @@ cdef class KeyData(object):
     AES = _mkkdi(xmlSecKeyDataAesId)
     DES = _mkkdi(xmlSecKeyDataDesId)
     DSA = _mkkdi(xmlSecKeyDataDsaId)
+    ECDSA = _mkkdi(xmlSecKeyDataEcdsaId)
     HMAC = _mkkdi(xmlSecKeyDataHmacId)
     RSA = _mkkdi(xmlSecKeyDataRsaId)
     X509 = _mkkdi(xmlSecKeyDataX509Id)
