Add support for dnQualifier in DNs.

diff --git a/src/libstrongswan/asn1/oid.txt b/src/libstrongswan/asn1/oid.txt
index 1f843643ebe0e3dd859a8dae31d35898ed5dfb4d..c3ff1a9e74ecd5c05f1017ce15f84249b408cc41 100644 (file)
--- a/src/libstrongswan/asn1/oid.txt
+++ b/src/libstrongswan/asn1/oid.txt
@@ -33,6 +33,7 @@
     0x2A                     "G"                                               OID_GIVEN_NAME
     0x2B                     "I"                                               OID_INITIALS
     0x2D                     "ID"                                              OID_UNIQUE_IDENTIFIER
+    0x2E                     "dnQualifier"                             OID_DN_QUALIFIER
     0x48                     "role"                                            OID_ROLE
   0x1D                       "id-ce"
     0x09                     "subjectDirectoryAttrs"

diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identification.c
index 252cfa28efdf88eb185d2c6873390bdb080072ff..9f0007f78db6ebdbebd9509aa3108c7ef90ade43 100644 (file)
--- a/src/libstrongswan/utils/identification.c
+++ b/src/libstrongswan/utils/identification.c
@@ -81,6 +81,7 @@ static const x501rdn_t x501rdns[] = {
        {"N",                                   OID_NAME,                                       ASN1_PRINTABLESTRING},
        {"G",                                   OID_GIVEN_NAME,                         ASN1_PRINTABLESTRING},
        {"I",                                   OID_INITIALS,                           ASN1_PRINTABLESTRING},
+       {"dnQualifier",                 OID_DN_QUALIFIER,                       ASN1_PRINTABLESTRING},
        {"ID",                                  OID_UNIQUE_IDENTIFIER,          ASN1_PRINTABLESTRING},
        {"EN",                                  OID_EMPLOYEE_NUMBER,            ASN1_PRINTABLESTRING},
        {"employeeNumber",              OID_EMPLOYEE_NUMBER,            ASN1_PRINTABLESTRING},
@@ -219,6 +220,7 @@ METHOD(enumerator_t, rdn_part_enumerate, bool,
                {OID_NAME,                              ID_PART_RDN_N},
                {OID_GIVEN_NAME,                ID_PART_RDN_G},
                {OID_INITIALS,                  ID_PART_RDN_I},
+               {OID_DN_QUALIFIER,              ID_PART_RDN_DNQ},
                {OID_UNIQUE_IDENTIFIER, ID_PART_RDN_ID},
                {OID_EMAIL_ADDRESS,             ID_PART_RDN_E},
                {OID_EMPLOYEE_NUMBER,   ID_PART_RDN_EN},

diff --git a/src/libstrongswan/utils/identification.h b/src/libstrongswan/utils/identification.h
index af0804f32e2dc360a9195e287af8095d756dafa3..3978b23f35d1036fe705308b6a87e0e9c8a75802 100644 (file)
--- a/src/libstrongswan/utils/identification.h
+++ b/src/libstrongswan/utils/identification.h
@@ -171,6 +171,8 @@ enum id_part_t {
        ID_PART_RDN_G,
        /** Initials RDN of a DN */
        ID_PART_RDN_I,
+       /** DN Qualifier RDN of a DN */
+       ID_PART_RDN_DNQ,
        /** UniqueIdentifier RDN of a DN */
        ID_PART_RDN_ID,
        /** Locality RDN of a DN */
@@ -298,7 +300,7 @@ struct identification_t {
  *
  * A distinguished name may contain one or more of the following RDNs:
  * ND, UID, DC, CN, S, SN, serialNumber, C, L, ST, O, OU, T, D,
- * N, G, I, ID, EN, EmployeeNumber, E, Email, emailAddress, UN,
+ * N, G, I, dnQualifier, ID, EN, EmployeeNumber, E, Email, emailAddress, UN,
  * unstructuredName, TCGID.
  *
  * This constructor never returns NULL. If it does not find a suitable