diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-11-12 05:00:42 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-11-12 08:00:42 -0500 |
| commit | c7ab9315fd7b58b4958f3e98c30ac731ef9e32ea (patch) | |
| tree | 8b8a8a4062f696031e6656d482c9924a20945966 | |
| parent | c3b8ff69c1377937808cf64621dda40cc3e29c0a (diff) | |
| download | cryptography-c7ab9315fd7b58b4958f3e98c30ac731ef9e32ea.tar.gz cryptography-c7ab9315fd7b58b4958f3e98c30ac731ef9e32ea.tar.bz2 cryptography-c7ab9315fd7b58b4958f3e98c30ac731ef9e32ea.zip | |
Turns out we shouldn't call it uniqueIdentifier (#3234)
http://www.ca.com/us/services-support/ca-support/ca-support-online/knowledge-base-articles.tec465360.html
| -rw-r--r-- | docs/x509/reference.rst | 2 | ||||
| -rw-r--r-- | src/cryptography/x509/oid.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst index eda0581b..bc408ae6 100644 --- a/docs/x509/reference.rst +++ b/docs/x509/reference.rst @@ -2306,7 +2306,7 @@ instances. The following common OIDs are available as constants. Corresponds to the dotted string ``"2.5.4.44"``. - .. attribute:: UNIQUE_IDENTIFIER + .. attribute:: X500_UNIQUE_IDENTIFIER .. versionadded:: 1.6 diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index a7e41d5c..5e60f9fb 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -107,7 +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") + X500_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") @@ -189,7 +189,7 @@ _OID_NAMES = { NameOID.GIVEN_NAME: "givenName", NameOID.TITLE: "title", NameOID.GENERATION_QUALIFIER: "generationQualifier", - NameOID.UNIQUE_IDENTIFIER: "uniqueIdentifier", + NameOID.X500_UNIQUE_IDENTIFIER: "x500UniqueIdentifier", NameOID.DN_QUALIFIER: "dnQualifier", NameOID.PSEUDONYM: "pseudonym", NameOID.DOMAIN_COMPONENT: "domainComponent", |