aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-06-23 22:32:26 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-06-23 22:32:26 -0500
commit77c98e3c4ef69d0cfee665cd0835670f4ac44242 (patch)
tree0bffee232bbdfbc3499e80f051dba3e4a46fbd88 /src
parent45de23a64653a68e8c23b892f0b017b6c4a57213 (diff)
parent3aadabf82fd81948334aa3e72510d64b16d96a15 (diff)
downloadcryptography-77c98e3c4ef69d0cfee665cd0835670f4ac44242.tar.gz
cryptography-77c98e3c4ef69d0cfee665cd0835670f4ac44242.tar.bz2
cryptography-77c98e3c4ef69d0cfee665cd0835670f4ac44242.zip
Merge pull request #2062 from alex/x509-ecdsa-sha1
Added teh OID for ECDSA with SHA1.
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/x509.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index 1d705e70..4b030ca9 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -36,6 +36,7 @@ _OID_NAMES = {
"1.2.840.113549.1.1.11": "sha256WithRSAEncryption",
"1.2.840.113549.1.1.12": "sha384WithRSAEncryption",
"1.2.840.113549.1.1.13": "sha512WithRSAEncryption",
+ "1.2.840.10045.4.1": "ecdsa-with-SHA1",
"1.2.840.10045.4.3.1": "ecdsa-with-SHA224",
"1.2.840.10045.4.3.2": "ecdsa-with-SHA256",
"1.2.840.10045.4.3.3": "ecdsa-with-SHA384",
@@ -1206,6 +1207,7 @@ OID_RSA_WITH_SHA224 = ObjectIdentifier("1.2.840.113549.1.1.14")
OID_RSA_WITH_SHA256 = ObjectIdentifier("1.2.840.113549.1.1.11")
OID_RSA_WITH_SHA384 = ObjectIdentifier("1.2.840.113549.1.1.12")
OID_RSA_WITH_SHA512 = ObjectIdentifier("1.2.840.113549.1.1.13")
+OID_ECDSA_WITH_SHA1 = ObjectIdentifier("1.2.840.10045.4.1")
OID_ECDSA_WITH_SHA224 = ObjectIdentifier("1.2.840.10045.4.3.1")
OID_ECDSA_WITH_SHA256 = ObjectIdentifier("1.2.840.10045.4.3.2")
OID_ECDSA_WITH_SHA384 = ObjectIdentifier("1.2.840.10045.4.3.3")
@@ -1221,6 +1223,7 @@ _SIG_OIDS_TO_HASH = {
OID_RSA_WITH_SHA256.dotted_string: hashes.SHA256(),
OID_RSA_WITH_SHA384.dotted_string: hashes.SHA384(),
OID_RSA_WITH_SHA512.dotted_string: hashes.SHA512(),
+ OID_ECDSA_WITH_SHA1.dotted_string: hashes.SHA1(),
OID_ECDSA_WITH_SHA224.dotted_string: hashes.SHA224(),
OID_ECDSA_WITH_SHA256.dotted_string: hashes.SHA256(),
OID_ECDSA_WITH_SHA384.dotted_string: hashes.SHA384(),