diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-19 13:44:23 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-19 13:44:23 -0500 |
| commit | 45e507f1349a0a7630408841b5470f36b2081925 (patch) | |
| tree | 34794087a8b4f999809edf40dfb9c77afeced141 | |
| parent | 1d3f2bfc98a9f561891b7d772ad58d0c5d07edb9 (diff) | |
| download | cryptography-45e507f1349a0a7630408841b5470f36b2081925.tar.gz cryptography-45e507f1349a0a7630408841b5470f36b2081925.tar.bz2 cryptography-45e507f1349a0a7630408841b5470f36b2081925.zip | |
added two more oids
| -rw-r--r-- | docs/x509/reference.rst | 8 | ||||
| -rw-r--r-- | src/cryptography/x509/oid.py | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst index 0bd169c9..f4b372e3 100644 --- a/docs/x509/reference.rst +++ b/docs/x509/reference.rst @@ -1855,6 +1855,14 @@ instances. The following common OIDs are available as constants. 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"``. + .. class:: SignatureAlgorithmOID diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index ebf6ca1d..329eba9f 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -81,6 +81,11 @@ class NameOID(object): 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" + ) + class SignatureAlgorithmOID(object): |