diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-12-19 20:53:51 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-12-19 20:53:51 -0600 |
| commit | fc504fee938a5223e790e4c221c20177bca6aa14 (patch) | |
| tree | b91451f33a8ddd5ae6ddacb61930a8a8e1198003 | |
| parent | 1abe1674db9352641f7a33e00ed799dc3750feee (diff) | |
| parent | 3b2fc96c540ee9770f344c47e1217e0a8d8ffd1c (diff) | |
| download | cryptography-fc504fee938a5223e790e4c221c20177bca6aa14.tar.gz cryptography-fc504fee938a5223e790e4c221c20177bca6aa14.tar.bz2 cryptography-fc504fee938a5223e790e4c221c20177bca6aa14.zip | |
Merge pull request #2534 from alex/ev-oid
Fixed #2531 -- added missing EV oid
| -rw-r--r-- | docs/x509/reference.rst | 16 | ||||
| -rw-r--r-- | src/cryptography/x509/oid.py | 13 |
2 files changed, 29 insertions, 0 deletions
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst index b2192c4e..91c53444 100644 --- a/docs/x509/reference.rst +++ b/docs/x509/reference.rst @@ -1851,6 +1851,22 @@ instances. The following common OIDs are available as constants. Corresponds to the dotted string ``"1.2.840.113549.1.9.1"``. + .. attribute:: JURISDICTION_COUNTRY_NAME + + Corresponds to the dotted string ``"1.3.6.1.4.1.311.60.2.1.3"``. + + .. attribute:: JURISDICTION_LOCALITY_NAME + + Corresponds to the dotted string ``"1.3.6.1.4.1.311.60.2.1.1"``. + + .. attribute:: JURISDICTION_STATE_OR_PROVINCE_NAME + + Corresponds to the dotted string ``"1.3.6.1.4.1.311.60.2.1.2"``. + + .. attribute:: BUSINESS_CATEGORY + + Corresponds to the dotted string ``"2.5.4.15"``. + .. class:: SignatureAlgorithmOID diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index 27fab86b..7b4df1c9 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -109,6 +109,12 @@ class NameOID(object): PSEUDONYM = ObjectIdentifier("2.5.4.65") DOMAIN_COMPONENT = ObjectIdentifier("0.9.2342.19200300.100.1.25") EMAIL_ADDRESS = ObjectIdentifier("1.2.840.113549.1.9.1") + JURISDICTION_COUNTRY_NAME = ObjectIdentifier("1.3.6.1.4.1.311.60.2.1.3") + JURISDICTION_LOCALITY_NAME = ObjectIdentifier("1.3.6.1.4.1.311.60.2.1.1") + JURISDICTION_STATE_OR_PROVINCE_NAME = ObjectIdentifier( + "1.3.6.1.4.1.311.60.2.1.2" + ) + BUSINESS_CATEGORY = ObjectIdentifier("2.5.4.15") class SignatureAlgorithmOID(object): @@ -180,6 +186,13 @@ _OID_NAMES = { NameOID.PSEUDONYM: "pseudonym", NameOID.DOMAIN_COMPONENT: "domainComponent", NameOID.EMAIL_ADDRESS: "emailAddress", + NameOID.JURISDICTION_COUNTRY_NAME: "jurisdictionCountryName", + NameOID.JURISDICTION_LOCALITY_NAME: "jurisdictionLocalityName", + NameOID.JURISDICTION_STATE_OR_PROVINCE_NAME: ( + "jurisdictionStateOrProvinceName" + ), + NameOID.BUSINESS_CATEGORY: "businessCategory", + SignatureAlgorithmOID.RSA_WITH_MD5: "md5WithRSAEncryption", SignatureAlgorithmOID.RSA_WITH_SHA1: "sha1WithRSAEncryption", SignatureAlgorithmOID.RSA_WITH_SHA224: "sha224WithRSAEncryption", |