diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-08-18 18:24:26 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-08-18 18:24:26 +0200 |
| commit | fc0ed07c1f44d56ac9a5353c23e4cd79ee2594dd (patch) | |
| tree | 357106fa49e5d2653f1b5768d56912382a72e38d /src/libstrongswan/utils/identification.c | |
| parent | c8b543a6fc28bc335212ec69d39cc57f5b0e4095 (diff) | |
| download | strongswan-fc0ed07c1f44d56ac9a5353c23e4cd79ee2594dd.tar.bz2 strongswan-fc0ed07c1f44d56ac9a5353c23e4cd79ee2594dd.tar.xz | |
pruned OID tree
Diffstat (limited to 'src/libstrongswan/utils/identification.c')
| -rw-r--r-- | src/libstrongswan/utils/identification.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identification.c index 7c3b19c51..c7888ffaf 100644 --- a/src/libstrongswan/utils/identification.c +++ b/src/libstrongswan/utils/identification.c @@ -85,9 +85,9 @@ static const x501rdn_t x501rdns[] = { {"ID", OID_UNIQUE_IDENTIFIER, ASN1_PRINTABLESTRING}, {"EN", OID_EMPLOYEE_NUMBER, ASN1_PRINTABLESTRING}, {"employeeNumber", OID_EMPLOYEE_NUMBER, ASN1_PRINTABLESTRING}, - {"E", OID_PKCS9_EMAIL, ASN1_IA5STRING}, - {"Email", OID_PKCS9_EMAIL, ASN1_IA5STRING}, - {"emailAddress", OID_PKCS9_EMAIL, ASN1_IA5STRING}, + {"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} @@ -605,8 +605,7 @@ static bool compare_dn(chunk_t t_dn, chunk_t o_dn, int *wc) if (t_type == o_type && (t_type == ASN1_PRINTABLESTRING || (t_type == ASN1_IA5STRING && - (asn1_known_oid(t_oid) == OID_PKCS9_EMAIL || - asn1_known_oid(t_oid) == OID_EMAIL_ADDRESS)))) + asn1_known_oid(t_oid) == OID_EMAIL_ADDRESS))) { /* ignore case for printableStrings and email RDNs */ if (strncasecmp(t_data.ptr, o_data.ptr, t_data.len) != 0) { |