diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-08-03 08:55:07 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-08-03 08:55:07 +0000 |
| commit | ea7db263739648ecbccb1ab7862d48f23b7bcc42 (patch) | |
| tree | 64bb92f29cb909990f1da1b7ff51ad28357c67d9 /epan/dissectors/packet-x509sat.c | |
| parent | 7e0e3b696bed90eac48afe746a3cd8359f8f05e2 (diff) | |
Added some missing elements from MS Certificate:
- Previous Cert Hash
- Virtual Base
- Next Publisher
svn path=/trunk/; revision=33695
Diffstat (limited to 'epan/dissectors/packet-x509sat.c')
| -rw-r--r-- | epan/dissectors/packet-x509sat.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 33e23759c2..ecc04c0d2a 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -1506,7 +1506,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 348 "x509sat.cnf" +#line 351 "x509sat.cnf" tvbuff_t *wide_tvb = NULL; char *string; @@ -1514,7 +1514,7 @@ dissect_x509sat_SyntaxBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in actx, tree, tvb, offset, hf_index, &wide_tvb); -#line 353 "x509sat.cnf" +#line 356 "x509sat.cnf" if (! wide_tvb) { return offset; } @@ -1628,7 +1628,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 362 "x509sat.cnf" +#line 365 "x509sat.cnf" gint8 class; gboolean pc; gint32 tag; @@ -2778,6 +2778,9 @@ void proto_reg_handoff_x509sat(void) { 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"); register_ber_oid_dissector("1.3.6.1.4.1.311.21.1", dissect_Integer_PDU, proto_x509sat, "id-ms-ca-version"); + register_ber_oid_dissector("1.3.6.1.4.1.311.21.2", dissect_OctetString_PDU, proto_x509sat, "id-ms-previous-cert-hash"); + register_ber_oid_dissector("1.3.6.1.4.1.311.21.3", dissect_Integer_PDU, proto_x509sat, "id-ms-virtual-base"); + register_ber_oid_dissector("1.3.6.1.4.1.311.21.4", dissect_SyntaxUTCTime_PDU, proto_x509sat, "id-ms-next-publish"); register_ber_oid_dissector("1.2.826.0.1063.7.0.0.0", dissect_Integer_PDU, proto_x509sat, "unknown-UK-organisation-defined-extension"); register_ber_oid_dissector("1.2.826.0.1004.10.1.1", dissect_SyntaxIA5String_PDU, proto_x509sat, "nexor-originating-ua"); register_ber_oid_dissector("2.6.1.6.3", dissect_Boolean_PDU, proto_x509sat, "id-sat-ipm-auto-discarded"); |