diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2012-11-12 22:00:53 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2012-11-12 22:00:53 +0000 |
| commit | f267dda0d5e95475049ee9aba554e5007570ad23 (patch) | |
| tree | c4d576bf4fae638d34e721161822ed20f775f150 /epan/dissectors/packet-x509sat.c | |
| parent | 4e96e6c4753bf4cf286bcce82c2fa8f097dbef09 (diff) | |
Added attributes from RFC 2798.
svn path=/trunk/; revision=46013
Diffstat (limited to 'epan/dissectors/packet-x509sat.c')
| -rw-r--r-- | epan/dissectors/packet-x509sat.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 9d1e776718..e4924be873 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -1504,7 +1504,7 @@ dissect_x509sat_SyntaxIA5String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_x509sat_SyntaxBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 370 "../../asn1/x509sat/x509sat.cnf" +#line 380 "../../asn1/x509sat/x509sat.cnf" tvbuff_t *wide_tvb = NULL; char *string; @@ -1512,7 +1512,7 @@ dissect_x509sat_SyntaxBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in actx, tree, tvb, offset, hf_index, &wide_tvb); -#line 375 "../../asn1/x509sat/x509sat.cnf" +#line 385 "../../asn1/x509sat/x509sat.cnf" if (! wide_tvb) { return offset; } @@ -1626,7 +1626,7 @@ dissect_x509sat_SyntaxGeneralString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_x509sat_GUID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 384 "../../asn1/x509sat/x509sat.cnf" +#line 394 "../../asn1/x509sat/x509sat.cnf" gint8 class; gboolean pc; gint32 tag; @@ -2791,6 +2791,12 @@ void proto_reg_handoff_x509sat(void) { register_ber_oid_dissector("1.3.6.1.5.5.7.9.4", dissect_SyntaxPrintableString_PDU, proto_x509sat, "pkcs-9-at-countryOfCitizenship"); register_ber_oid_dissector("1.3.6.1.5.5.7.9.5", dissect_SyntaxPrintableString_PDU, proto_x509sat, "pkcs-9-at-countryOfResidence"); register_ber_oid_dissector("0.9.2342.19200300.100.1.25", dissect_SyntaxIA5String_PDU, proto_x509sat, "dc"); + register_ber_oid_dissector("2.16.840.1.113730.3.1.1", dissect_DirectoryString_PDU, proto_x509sat, "carLicense"); + register_ber_oid_dissector("2.16.840.1.113730.3.1.2", dissect_DirectoryString_PDU, proto_x509sat, "departmentNumber"); + register_ber_oid_dissector("2.16.840.1.113730.3.1.3", dissect_DirectoryString_PDU, proto_x509sat, "employeeNumber"); + register_ber_oid_dissector("2.16.840.1.113730.3.1.4", dissect_DirectoryString_PDU, proto_x509sat, "employeeType"); + register_ber_oid_dissector("2.16.840.1.113730.3.1.39", dissect_DirectoryString_PDU, proto_x509sat, "preferredLanguage"); + register_ber_oid_dissector("2.16.840.1.113730.3.1.241", dissect_DirectoryString_PDU, proto_x509sat, "displayName"); register_ber_oid_dissector("1.3.6.1.4.1.311.20.2", dissect_SyntaxBMPString_PDU, proto_x509sat, "id-ms-certificate-template-name"); register_ber_oid_dissector("1.3.6.1.4.1.311.20.2.3", dissect_SyntaxUTF8String_PDU, proto_x509sat, "id-ms-user-principal-name"); register_ber_oid_dissector("1.3.6.1.4.1.311.17.1", dissect_SyntaxBMPString_PDU, proto_x509sat, "id-ms-local-machine-keyset"); @@ -2844,6 +2850,8 @@ void proto_reg_handoff_x509sat(void) { oid_add_from_string("dcObject","1.3.6.1.4.1.1446.344"); oid_add_from_string("domain","0.9.2342.19200300.100.4.13"); + /* RFC 2798 */ + oid_add_from_string("inetOrgPerson","2.16.840.1.113730.3.2.2"); } |