asn1: Add additional OIDs seen in certificate DNs

diff --git a/src/libstrongswan/asn1/oid.txt b/src/libstrongswan/asn1/oid.txt
index a0c2aada388f4de2c91d3da86c2b192141b59d55..e4dffa857feadc7e63f93e12bec1863e206ac868 100644 (file)
--- a/src/libstrongswan/asn1/oid.txt
+++ b/src/libstrongswan/asn1/oid.txt
@@ -24,10 +24,13 @@
     0x06                     "C"                                               OID_COUNTRY
     0x07                     "L"                                               OID_LOCALITY
     0x08                     "ST"                                              OID_STATE_OR_PROVINCE
+    0x09                     "STREET"                                  OID_STREET_ADDRESS
     0x0A                     "O"                                               OID_ORGANIZATION
     0x0B                     "OU"                                              OID_ORGANIZATION_UNIT
     0x0C                     "T"                                               OID_TITLE
     0x0D                     "D"                                               OID_DESCRIPTION
+    0x10                     "postalAddress"                   OID_POSTAL_ADDRESS
+    0x11                     "postalCode"                              OID_POSTAL_CODE
     0x24                     "userCertificate"                 OID_USER_CERTIFICATE
     0x29                     "N"                                               OID_NAME
     0x2A                     "G"                                               OID_GIVEN_NAME

diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identification.c
index 1a47690630fbf5923aa4130d66970e6081a8fc59..56298a60f3e4979b1a72fb82620b8572404c4c46 100644 (file)
--- a/src/libstrongswan/utils/identification.c
+++ b/src/libstrongswan/utils/identification.c
@@ -72,10 +72,13 @@ static const x501rdn_t x501rdns[] = {
        {"C",                                   OID_COUNTRY,                            ASN1_PRINTABLESTRING},
        {"L",                                   OID_LOCALITY,                           ASN1_PRINTABLESTRING},
        {"ST",                                  OID_STATE_OR_PROVINCE,          ASN1_PRINTABLESTRING},
+       {"STREET",                              OID_STREET_ADDRESS,                     ASN1_PRINTABLESTRING},
        {"O",                                   OID_ORGANIZATION,                       ASN1_PRINTABLESTRING},
        {"OU",                                  OID_ORGANIZATION_UNIT,          ASN1_PRINTABLESTRING},
        {"T",                                   OID_TITLE,                                      ASN1_PRINTABLESTRING},
        {"D",                                   OID_DESCRIPTION,                        ASN1_PRINTABLESTRING},
+       {"postalAddress",               OID_POSTAL_ADDRESS,                     ASN1_PRINTABLESTRING},
+       {"postalCode",                  OID_POSTAL_CODE,                        ASN1_PRINTABLESTRING},
        {"N",                                   OID_NAME,                                       ASN1_PRINTABLESTRING},
        {"G",                                   OID_GIVEN_NAME,                         ASN1_PRINTABLESTRING},
        {"I",                                   OID_INITIALS,                           ASN1_PRINTABLESTRING},