commit c7ab9315fd7b58b4958f3e98c30ac731ef9e32ea
author Paul Kehrer <paul.l.kehrer@gmail.com> Sat Nov 12 05:00:42 2016 -0800
committer Alex Gaynor <alex.gaynor@gmail.com> Sat Nov 12 08:00:42 2016 -0500
tree 8b8a8a4062f696031e6656d482c9924a20945966
parent c3b8ff69c1377937808cf64621dda40cc3e29c0a

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

docs/x509/reference.rst

diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst
index eda0581..bc408ae 100644
--- a/docs/x509/reference.rst
+++ b/docs/x509/reference.rst
@@ -2306,7 +2306,7 @@
 
         Corresponds to the dotted string ``"2.5.4.44"``.
 
-    .. attribute:: UNIQUE_IDENTIFIER
+    .. attribute:: X500_UNIQUE_IDENTIFIER
 
         .. versionadded:: 1.6
 

src/cryptography/x509/oid.py

diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py
index a7e41d5..5e60f9f 100644
--- a/src/cryptography/x509/oid.py
+++ b/src/cryptography/x509/oid.py
@@ -107,7 +107,7 @@
     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 @@
     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",