diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-02-18 15:19:48 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-02-18 17:47:40 +0000 |
| commit | d9d6106044065ed748748ba2135a9ac3cd6c5108 (patch) | |
| tree | f0eb8d1016998eb008b603a393e344560916a4d6 /epan/dissectors/packet-pkcs12.c | |
| parent | 47726eafe572686e5b36ea2e8798096cf1a07bf9 (diff) | |
ASN.1: update auto generated dissectors
Change-Id: Ic73e72b3d2e7590eaed07f6eb30f74f4303e7a65
Reviewed-on: https://code.wireshark.org/review/25880
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-pkcs12.c')
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index fa991f95c8..2a636eb3f8 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -124,7 +124,7 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 76 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 64 "./asn1/pkcs12/packet-pkcs12-template.c" /* Initialize the subtree pointers */ @@ -151,7 +151,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 79 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 67 "./asn1/pkcs12/packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -1107,7 +1107,7 @@ static int dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 374 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 362 "./asn1/pkcs12/packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1392,7 +1392,7 @@ void proto_register_pkcs12(void) { "AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 450 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 438 "./asn1/pkcs12/packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1422,7 +1422,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 456 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 444 "./asn1/pkcs12/packet-pkcs12-template.c" }; static ei_register_info ei[] = { { &ei_pkcs12_octet_string_expected, { "pkcs12.octet_string_expected", PI_PROTOCOL, PI_WARN, "BER Error: OCTET STRING expected", EXPFILL }}, @@ -1490,7 +1490,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 495 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 483 "./asn1/pkcs12/packet-pkcs12-template.c" register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); |