diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-19 08:21:04 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-19 08:21:04 -0600 |
| commit | 71d40c6af6c70f38da3bf1f65c8b8f16ae7d567e (patch) | |
| tree | 3ab6fe7447b61c9873c2612348b7851ab82238e9 /src | |
| parent | e19201e6250cf0f60bbf2362938294ab7c533d3b (diff) | |
| download | cryptography-71d40c6af6c70f38da3bf1f65c8b8f16ae7d567e.tar.gz cryptography-71d40c6af6c70f38da3bf1f65c8b8f16ae7d567e.tar.bz2 cryptography-71d40c6af6c70f38da3bf1f65c8b8f16ae7d567e.zip | |
address review feedback, fix short names for sig alg OIDs
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/x509.py | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index 0273ca86..774830df 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -29,19 +29,19 @@ _OID_NAMES = { "2.5.4.65": "pseudonym", "0.9.2342.19200300.100.1.25": "domainComponent", "1.2.840.113549.1.9.1": "emailAddress", - "1.2.840.113549.1.1.4": "md5WithRSA", - "1.2.840.113549.1.1.5": "sha1WithRSA", + "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.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": "dsaWithSHA1", - "2.16.840.1.101.3.4.3.1": "dsa_with_SHA224", - "2.16.840.1.101.3.4.3.2": "dsa_with_SHA256", + "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", } @@ -157,12 +157,12 @@ OID_PSEUDONYM = ObjectIdentifier("2.5.4.65") OID_DOMAIN_COMPONENT = ObjectIdentifier("0.9.2342.19200300.100.1.25") OID_EMAIL_ADDRESS = ObjectIdentifier("1.2.840.113549.1.9.1") -OID_MD5_WITH_RSA = ObjectIdentifier("1.2.840.113549.1.1.4") -OID_SHA1_WITH_RSA = ObjectIdentifier("1.2.840.113549.1.1.5") -OID_SHA224_WITH_RSA = ObjectIdentifier("1.2.840.113549.1.1.14") -OID_SHA256_WITH_RSA = ObjectIdentifier("1.2.840.113549.1.1.11") -OID_SHA384_WITH_RSA = ObjectIdentifier("1.2.840.113549.1.1.12") -OID_SHA512_WITH_RSA = ObjectIdentifier("1.2.840.113549.1.1.13") +OID_MD5_WITH_RSA_ENCRYPTION = ObjectIdentifier("1.2.840.113549.1.1.4") +OID_SHA1_WITH_RSA_ENCRYPTION = ObjectIdentifier("1.2.840.113549.1.1.5") +OID_SHA224_WITH_RSA_ENCRYPTION = ObjectIdentifier("1.2.840.113549.1.1.14") +OID_SHA256_WITH_RSA_ENCRYPTION = ObjectIdentifier("1.2.840.113549.1.1.11") +OID_SHA384_WITH_RSA_ENCRYPTION = ObjectIdentifier("1.2.840.113549.1.1.12") +OID_SHA512_WITH_RSA_ENCRYPTION = ObjectIdentifier("1.2.840.113549.1.1.13") 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") @@ -172,12 +172,12 @@ OID_DSA_WITH_SHA224 = ObjectIdentifier("2.16.840.1.101.3.4.3.1") OID_DSA_WITH_SHA256 = ObjectIdentifier("2.16.840.1.101.3.4.3.2") _SIG_OIDS_TO_HASH = { - OID_MD5_WITH_RSA.dotted_string: hashes.MD5(), - OID_SHA1_WITH_RSA.dotted_string: hashes.SHA1(), - OID_SHA224_WITH_RSA.dotted_string: hashes.SHA224(), - OID_SHA256_WITH_RSA.dotted_string: hashes.SHA256(), - OID_SHA384_WITH_RSA.dotted_string: hashes.SHA384(), - OID_SHA512_WITH_RSA.dotted_string: hashes.SHA512(), + OID_MD5_WITH_RSA_ENCRYPTION.dotted_string: hashes.MD5(), + OID_SHA1_WITH_RSA_ENCRYPTION.dotted_string: hashes.SHA1(), + OID_SHA224_WITH_RSA_ENCRYPTION.dotted_string: hashes.SHA224(), + OID_SHA256_WITH_RSA_ENCRYPTION.dotted_string: hashes.SHA256(), + OID_SHA384_WITH_RSA_ENCRYPTION.dotted_string: hashes.SHA384(), + OID_SHA512_WITH_RSA_ENCRYPTION.dotted_string: hashes.SHA512(), OID_ECDSA_WITH_SHA224.dotted_string: hashes.SHA224(), OID_ECDSA_WITH_SHA256.dotted_string: hashes.SHA256(), OID_ECDSA_WITH_SHA384.dotted_string: hashes.SHA384(), |