aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/x509/reference.rst16
-rw-r--r--src/cryptography/x509/oid.py13
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",