diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-03-23 16:44:08 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-03-23 16:44:08 +0000 |
| commit | e9aa0abd324f9c8acc26dd6f9d605b5b19a81a1d (patch) | |
| tree | 2293c93f933a48b67edb4ce50b792169450e4b6e /asn1/x509sat | |
| parent | aa2b2c82abfa761c9f068be36fe69f49414e3d81 (diff) | |
| download | wireshark-e9aa0abd324f9c8acc26dd6f9d605b5b19a81a1d.tar.gz | |
Support for:
RFC2247 objectclasses and attributes (specifically "dc")
Microsoft-defined User Principal Name subjectAltName extension (used in certificates)
svn path=/trunk/; revision=21150
Diffstat (limited to 'asn1/x509sat')
| -rw-r--r-- | asn1/x509sat/packet-x509sat-template.c | 5 | ||||
| -rw-r--r-- | asn1/x509sat/x509sat.cnf | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index f8433bf71e..836fd8a3dd 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -109,6 +109,11 @@ void proto_reg_handoff_x509sat(void) { add_oid_str_name("2.5.6.28", "parent"); add_oid_str_name("2.5.6.29", "child"); + + /* RFC 2247 */ + add_oid_str_name("1.3.6.1.4.1.1446.344", "dcObject"); + add_oid_str_name("0.9.2342.19200300.100.4.13", "domain"); + } diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index 6256f24e2e..6a03972a29 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -262,6 +262,13 @@ SyntaxPrintableString B "1.3.6.1.5.5.7.9.3" "pkcs-9-at-gender" SyntaxPrintableString B "1.3.6.1.5.5.7.9.4" "pkcs-9-at-countryOfCitizenship" SyntaxPrintableString B "1.3.6.1.5.5.7.9.5" "pkcs-9-at-countryOfResidence" +# RFC 2247 +SyntaxIA5String B "0.9.2342.19200300.100.1.25" "dc" + +# Microsoft-specific +# GeneralName other-name +SyntaxUTF8String B "1.3.6.1.4.1.311.20.2.3" "id-ms-user-principal-name" + # unknown X.420 PerRecipientExtensionField Integer B "1.2.826.0.1063.7.0.0.0" "unknown-UK-organisation-defined-extension" |