diff options
| -rw-r--r-- | asn1/x509sat/x509sat.cnf | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-x509sat.c | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index 27a14bb69d..825e8abb88 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -290,6 +290,7 @@ SyntaxIA5String B "0.9.2342.19200300.100.1.25" "dc" # GeneralName other-name SyntaxBMPString B "1.3.6.1.4.1.311.20.2" "id-ms-certificate-template-name" SyntaxUTF8String B "1.3.6.1.4.1.311.20.2.3" "id-ms-user-principal-name" +SyntaxBMPString B "1.3.6.1.4.1.311.17.1" "id-ms-local-machine-keyset" # unknown X.420 PerRecipientExtensionField Integer B "1.2.826.0.1063.7.0.0.0" "unknown-UK-organisation-defined-extension" diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 06bd50a3cf..a884ca8490 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509sat.c */ -/* ../../tools/asn2wrs.py -b -e -p x509sat -c ./x509sat.cnf -s ./packet-x509sat-template -D . SelectedAttributeTypes.asn */ +/* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ /* Input file: packet-x509sat-template.c */ @@ -1502,7 +1502,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 323 "x509sat.cnf" +#line 324 "x509sat.cnf" tvbuff_t *wide_tvb = NULL; char *string; @@ -1510,7 +1510,7 @@ dissect_x509sat_SyntaxBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in actx, tree, tvb, offset, hf_index, &wide_tvb); -#line 328 "x509sat.cnf" +#line 329 "x509sat.cnf" if (! wide_tvb) { return offset; } @@ -1547,7 +1547,7 @@ dissect_x509sat_SyntaxGraphicString(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 337 "x509sat.cnf" +#line 338 "x509sat.cnf" gint8 class; gboolean pc; gint32 tag; @@ -2587,6 +2587,7 @@ void proto_reg_handoff_x509sat(void) { register_ber_oid_dissector("0.9.2342.19200300.100.1.25", dissect_SyntaxIA5String_PDU, proto_x509sat, "dc"); 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"); 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"); |