support unstructuredAddress in left|rightid
authorAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 18 Apr 2011 21:40:31 +0000 (23:40 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 18 Apr 2011 21:40:31 +0000 (23:40 +0200)
src/libstrongswan/asn1/oid.txt
src/libstrongswan/utils/identification.c

index f86dc8d..f16287c 100644 (file)
                 0x05         "signingTime"                             OID_PKCS9_SIGNING_TIME
                 0x06         "counterSignature"
                 0x07         "challengePassword"               OID_CHALLENGE_PASSWORD
-                0x08         "unstructuredAddress"
+                0x08         "unstructuredAddress"             OID_UNSTRUCTURED_ADDRESS
                 0x0E         "extensionRequest"                        OID_EXTENSION_REQUEST
                 0x0F         "S/MIME Capabilities"
             0x02             "digestAlgorithm"
index fd2716d..252cfa2 100644 (file)
@@ -64,32 +64,34 @@ typedef struct {
 } x501rdn_t;
 
 static const x501rdn_t x501rdns[] = {
-       {"ND",                          OID_NAME_DISTINGUISHER,         ASN1_PRINTABLESTRING},
-       {"UID",                         OID_PILOT_USERID,                       ASN1_PRINTABLESTRING},
-       {"DC",                          OID_PILOT_DOMAIN_COMPONENT, ASN1_PRINTABLESTRING},
-       {"CN",                          OID_COMMON_NAME,                        ASN1_PRINTABLESTRING},
-       {"S",                           OID_SURNAME,                            ASN1_PRINTABLESTRING},
-       {"SN",                          OID_SERIAL_NUMBER,                      ASN1_PRINTABLESTRING},
-       {"serialNumber",        OID_SERIAL_NUMBER,                      ASN1_PRINTABLESTRING},
-       {"C",                           OID_COUNTRY,                            ASN1_PRINTABLESTRING},
-       {"L",                           OID_LOCALITY,                           ASN1_PRINTABLESTRING},
-       {"ST",                          OID_STATE_OR_PROVINCE,          ASN1_PRINTABLESTRING},
-       {"O",                           OID_ORGANIZATION,                       ASN1_PRINTABLESTRING},
-       {"OU",                          OID_ORGANIZATION_UNIT,          ASN1_PRINTABLESTRING},
-       {"T",                           OID_TITLE,                                      ASN1_PRINTABLESTRING},
-       {"D",                           OID_DESCRIPTION,                        ASN1_PRINTABLESTRING},
-       {"N",                           OID_NAME,                                       ASN1_PRINTABLESTRING},
-       {"G",                           OID_GIVEN_NAME,                         ASN1_PRINTABLESTRING},
-       {"I",                           OID_INITIALS,                           ASN1_PRINTABLESTRING},
-       {"ID",                          OID_UNIQUE_IDENTIFIER,          ASN1_PRINTABLESTRING},
-       {"EN",                          OID_EMPLOYEE_NUMBER,            ASN1_PRINTABLESTRING},
-       {"employeeNumber",      OID_EMPLOYEE_NUMBER,            ASN1_PRINTABLESTRING},
-       {"E",                           OID_EMAIL_ADDRESS,                      ASN1_IA5STRING},
-       {"Email",                       OID_EMAIL_ADDRESS,                      ASN1_IA5STRING},
-       {"emailAddress",        OID_EMAIL_ADDRESS,                      ASN1_IA5STRING},
-       {"UN",                          OID_UNSTRUCTURED_NAME,          ASN1_IA5STRING},
-       {"unstructuredName",OID_UNSTRUCTURED_NAME,              ASN1_IA5STRING},
-       {"TCGID",                       OID_TCGID,                                      ASN1_PRINTABLESTRING}
+       {"ND",                                  OID_NAME_DISTINGUISHER,         ASN1_PRINTABLESTRING},
+       {"UID",                                 OID_PILOT_USERID,                       ASN1_PRINTABLESTRING},
+       {"DC",                                  OID_PILOT_DOMAIN_COMPONENT, ASN1_PRINTABLESTRING},
+       {"CN",                                  OID_COMMON_NAME,                        ASN1_PRINTABLESTRING},
+       {"S",                                   OID_SURNAME,                            ASN1_PRINTABLESTRING},
+       {"SN",                                  OID_SERIAL_NUMBER,                      ASN1_PRINTABLESTRING},
+       {"serialNumber",                OID_SERIAL_NUMBER,                      ASN1_PRINTABLESTRING},
+       {"C",                                   OID_COUNTRY,                            ASN1_PRINTABLESTRING},
+       {"L",                                   OID_LOCALITY,                           ASN1_PRINTABLESTRING},
+       {"ST",                                  OID_STATE_OR_PROVINCE,          ASN1_PRINTABLESTRING},
+       {"O",                                   OID_ORGANIZATION,                       ASN1_PRINTABLESTRING},
+       {"OU",                                  OID_ORGANIZATION_UNIT,          ASN1_PRINTABLESTRING},
+       {"T",                                   OID_TITLE,                                      ASN1_PRINTABLESTRING},
+       {"D",                                   OID_DESCRIPTION,                        ASN1_PRINTABLESTRING},
+       {"N",                                   OID_NAME,                                       ASN1_PRINTABLESTRING},
+       {"G",                                   OID_GIVEN_NAME,                         ASN1_PRINTABLESTRING},
+       {"I",                                   OID_INITIALS,                           ASN1_PRINTABLESTRING},
+       {"ID",                                  OID_UNIQUE_IDENTIFIER,          ASN1_PRINTABLESTRING},
+       {"EN",                                  OID_EMPLOYEE_NUMBER,            ASN1_PRINTABLESTRING},
+       {"employeeNumber",              OID_EMPLOYEE_NUMBER,            ASN1_PRINTABLESTRING},
+       {"E",                                   OID_EMAIL_ADDRESS,                      ASN1_IA5STRING},
+       {"Email",                               OID_EMAIL_ADDRESS,                      ASN1_IA5STRING},
+       {"emailAddress",                OID_EMAIL_ADDRESS,                      ASN1_IA5STRING},
+       {"UN",                                  OID_UNSTRUCTURED_NAME,          ASN1_IA5STRING},
+       {"unstructuredName",    OID_UNSTRUCTURED_NAME,          ASN1_IA5STRING},
+       {"UA",                                  OID_UNSTRUCTURED_ADDRESS,       ASN1_PRINTABLESTRING},
+       {"unstructuredAddress", OID_UNSTRUCTURED_ADDRESS,       ASN1_PRINTABLESTRING},
+       {"TCGID",                               OID_TCGID,                                      ASN1_PRINTABLESTRING}
 };
 
 /**