aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-08-09 18:24:52 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-08-09 18:24:52 -0400
commit3eb273600f4a381a7ab9942977dfccc289da9492 (patch)
tree8ef82a2aadfaee26a8f1abb7e5f3087c9ee871fd
parent7e197ca673d2647471ffc94b864a94eae7a40a2b (diff)
downloadcryptography-3eb273600f4a381a7ab9942977dfccc289da9492.tar.gz
cryptography-3eb273600f4a381a7ab9942977dfccc289da9492.tar.bz2
cryptography-3eb273600f4a381a7ab9942977dfccc289da9492.zip
De-duplicate OIDs for signatures
-rw-r--r--src/cryptography/x509/oid.py28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py
index a607f442..d29546f3 100644
--- a/src/cryptography/x509/oid.py
+++ b/src/cryptography/x509/oid.py
@@ -133,20 +133,20 @@ _OID_NAMES = {
OID_PSEUDONYM.dotted_string: "pseudonym",
OID_DOMAIN_COMPONENT.dotted_string: "domainComponent",
OID_EMAIL_ADDRESS.dotted_string: "emailAddress",
- "1.2.840.113549.1.1.4": "md5WithRSAEncryption",
- "1.2.840.113549.1.1.5": "sha1WithRSAEncryption",
- "1.2.840.113549.1.1.14": "sha224WithRSAEncryption",
- "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",
- "1.2.840.10045.4.3.4": "ecdsa-with-SHA512",
- "1.2.840.10040.4.3": "dsa-with-sha1",
- "2.16.840.1.101.3.4.3.1": "dsa-with-sha224",
- "2.16.840.1.101.3.4.3.2": "dsa-with-sha256",
+ OID_RSA_WITH_MD5.dotted_string: "md5WithRSAEncryption",
+ OID_RSA_WITH_SHA1.dotted_string: "sha1WithRSAEncryption",
+ OID_RSA_WITH_SHA224.dotted_string: "sha224WithRSAEncryption",
+ OID_RSA_WITH_SHA256.dotted_string: "sha256WithRSAEncryption",
+ OID_RSA_WITH_SHA384.dotted_string: "sha384WithRSAEncryption",
+ OID_RSA_WITH_SHA512.dotted_string: "sha512WithRSAEncryption",
+ OID_ECDSA_WITH_SHA1.dotted_string: "ecdsa-with-SHA1",
+ OID_ECDSA_WITH_SHA224.dotted_string: "ecdsa-with-SHA224",
+ OID_ECDSA_WITH_SHA256.dotted_string: "ecdsa-with-SHA256",
+ OID_ECDSA_WITH_SHA384.dotted_string: "ecdsa-with-SHA384",
+ OID_ECDSA_WITH_SHA512.dotted_string: "ecdsa-with-SHA512",
+ OID_DSA_WITH_SHA1.dotted_string: "dsa-with-sha1",
+ OID_DSA_WITH_SHA224.dotted_string: "dsa-with-sha224",
+ OID_DSA_WITH_SHA256.dotted_string: "dsa-with-sha256",
"1.3.6.1.5.5.7.3.1": "serverAuth",
"1.3.6.1.5.5.7.3.2": "clientAuth",
"1.3.6.1.5.5.7.3.3": "codeSigning",