X.509 cert attributes map added
diff --git a/CHANGES.txt b/CHANGES.txt
index b09e2ad..b348378 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
-----------------------------------
* Added X.509 certificate extensions map
+* Added X.509 attribute type map
* Fix to __doc__ use in setup.py to make -O0 installation mode working.
* Copyright added to source files.
* Author's e-mail changed
diff --git a/pyasn1_modules/rfc2459.py b/pyasn1_modules/rfc2459.py
index b639028..2eb6c4e 100644
--- a/pyasn1_modules/rfc2459.py
+++ b/pyasn1_modules/rfc2459.py
@@ -1263,6 +1263,26 @@
class IssuerAltName(GeneralNames):
pass
+
+# map of AttributeType -> AttributeValue
+
+certificateAttributesMap = {
+ id_at_name: X520name,
+ id_at_surname: X520name,
+ id_at_givenName: X520name,
+ id_at_initials: X520name,
+ id_at_generationQualifier: X520name,
+ id_at_commonName: X520CommonName,
+ id_at_localityName: X520LocalityName,
+ id_at_stateOrProvinceName: X520StateOrProvinceName,
+ id_at_organizationName: X520OrganizationName,
+ id_at_organizationalUnitName: X520OrganizationalUnitName,
+ id_at_title: X520Title,
+ id_at_dnQualifier: X520dnQualifier,
+ id_at_countryName: X520countryName,
+ emailAddress: Pkcs9email,
+}
+
# map of Certificate Extension OIDs to Extensions
certificateExtensionsMap = {
diff --git a/pyasn1_modules/rfc5280.py b/pyasn1_modules/rfc5280.py
index cee14a5..ffc93b5 100644
--- a/pyasn1_modules/rfc5280.py
+++ b/pyasn1_modules/rfc5280.py
@@ -1543,6 +1543,28 @@
id_ce_inhibitAnyPolicy = _buildOid(id_ce, 54)
+# map of AttributeType -> AttributeValue
+
+certificateAttributesMap = {
+ id_at_name: X520name,
+ id_at_surname: X520name,
+ id_at_givenName: X520name,
+ id_at_initials: X520name,
+ id_at_generationQualifier: X520name,
+ id_at_commonName: X520CommonName,
+ id_at_localityName: X520LocalityName,
+ id_at_stateOrProvinceName: X520StateOrProvinceName,
+ id_at_organizationName: X520OrganizationName,
+ id_at_organizationalUnitName: X520OrganizationalUnitName,
+ id_at_title: X520Title,
+ id_at_dnQualifier: X520dnQualifier,
+ id_at_countryName: X520countryName,
+ id_at_serialNumber: X520SerialNumber,
+ id_at_pseudonym: X520Pseudonym,
+ id_domainComponent: DomainComponent,
+ id_emailAddress: EmailAddress,
+}
+
# map of Certificate Extension OIDs to Extensions
certificateExtensionsMap = {
