diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-11-11 17:38:59 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-11-11 20:38:59 -0500 |
| commit | c3b8ff69c1377937808cf64621dda40cc3e29c0a (patch) | |
| tree | 9fbafdbc53d582f3108a4c49611151e97f883653 | |
| parent | c41b9d4749643f58618be4a80fd043b81c0e2291 (diff) | |
| download | cryptography-c3b8ff69c1377937808cf64621dda40cc3e29c0a.tar.gz cryptography-c3b8ff69c1377937808cf64621dda40cc3e29c0a.tar.bz2 cryptography-c3b8ff69c1377937808cf64621dda40cc3e29c0a.zip | |
add some new oids (#3233)
* add some new oids
* As Alex pointed out, it's streetAddress
| -rw-r--r-- | docs/x509/reference.rst | 12 | ||||
| -rw-r--r-- | src/cryptography/x509/oid.py | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst index ce479a7c..eda0581b 100644 --- a/docs/x509/reference.rst +++ b/docs/x509/reference.rst @@ -2270,6 +2270,12 @@ instances. The following common OIDs are available as constants. Corresponds to the dotted string ``"2.5.4.8"``. + .. attribute:: STREET_ADDRESS + + .. versionadded:: 1.6 + + Corresponds to the dotted string ``"2.5.4.9"``. + .. attribute:: ORGANIZATION_NAME Corresponds to the dotted string ``"2.5.4.10"``. @@ -2300,6 +2306,12 @@ instances. The following common OIDs are available as constants. Corresponds to the dotted string ``"2.5.4.44"``. + .. attribute:: UNIQUE_IDENTIFIER + + .. versionadded:: 1.6 + + Corresponds to the dotted string ``"2.5.4.45"``. + .. attribute:: DN_QUALIFIER Corresponds to the dotted string ``"2.5.4.46"``. This specifies diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index 3848b89e..a7e41d5c 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -99,6 +99,7 @@ class NameOID(object): COUNTRY_NAME = ObjectIdentifier("2.5.4.6") LOCALITY_NAME = ObjectIdentifier("2.5.4.7") STATE_OR_PROVINCE_NAME = ObjectIdentifier("2.5.4.8") + STREET_ADDRESS = ObjectIdentifier("2.5.4.9") ORGANIZATION_NAME = ObjectIdentifier("2.5.4.10") ORGANIZATIONAL_UNIT_NAME = ObjectIdentifier("2.5.4.11") SERIAL_NUMBER = ObjectIdentifier("2.5.4.5") @@ -106,6 +107,7 @@ class NameOID(object): GIVEN_NAME = ObjectIdentifier("2.5.4.42") TITLE = ObjectIdentifier("2.5.4.12") GENERATION_QUALIFIER = ObjectIdentifier("2.5.4.44") + UNIQUE_IDENTIFIER = ObjectIdentifier("2.5.4.45") DN_QUALIFIER = ObjectIdentifier("2.5.4.46") PSEUDONYM = ObjectIdentifier("2.5.4.65") DOMAIN_COMPONENT = ObjectIdentifier("0.9.2342.19200300.100.1.25") @@ -179,6 +181,7 @@ _OID_NAMES = { NameOID.COUNTRY_NAME: "countryName", NameOID.LOCALITY_NAME: "localityName", NameOID.STATE_OR_PROVINCE_NAME: "stateOrProvinceName", + NameOID.STREET_ADDRESS: "streetAddress", NameOID.ORGANIZATION_NAME: "organizationName", NameOID.ORGANIZATIONAL_UNIT_NAME: "organizationalUnitName", NameOID.SERIAL_NUMBER: "serialNumber", @@ -186,6 +189,7 @@ _OID_NAMES = { NameOID.GIVEN_NAME: "givenName", NameOID.TITLE: "title", NameOID.GENERATION_QUALIFIER: "generationQualifier", + NameOID.UNIQUE_IDENTIFIER: "uniqueIdentifier", NameOID.DN_QUALIFIER: "dnQualifier", NameOID.PSEUDONYM: "pseudonym", NameOID.DOMAIN_COMPONENT: "domainComponent", |