diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-12-08 23:29:21 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-12-08 23:29:21 +0000 |
commit | e08d65db021e25ab92a362a029c1c263f8c6bb21 (patch) | |
tree | 0e3df38ff6beeed4ad09db532adb3806d30eddea /epan/dissectors/packet-ocsp.c | |
parent | 7638b61e373dc6d3cc59a3e6710e0cbac258a325 (diff) |
Regenerate with the latest asn2eth, to get FT_OID used, and to add #line.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16736 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ocsp.c')
-rw-r--r-- | epan/dissectors/packet-ocsp.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 27de186e3e..b26fc1a095 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -1,10 +1,11 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-ocsp.c */ +/* ./packet-ocsp.c */ /* ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ /* Input file: packet-ocsp-template.c */ +#line 1 "packet-ocsp-template.c" /* packet-ocsp.c * Routines for Online Certificate Status Protocol (RFC2560) packet dissection * Ronnie Sahlberg 2004 @@ -56,7 +57,7 @@ static int proto_ocsp = -1; static int hf_ocsp_responseType_id = -1; /*--- Included file: packet-ocsp-hf.c ---*/ - +#line 1 "packet-ocsp-hf.c" static int hf_ocsp_BasicOCSPResponse_PDU = -1; /* BasicOCSPResponse */ static int hf_ocsp_ArchiveCutoff_PDU = -1; /* ArchiveCutoff */ static int hf_ocsp_AcceptableResponses_PDU = -1; /* AcceptableResponses */ @@ -109,13 +110,13 @@ static int hf_ocsp_crlNum = -1; /* INTEGER */ static int hf_ocsp_crlTime = -1; /* GeneralizedTime */ /*--- End of included file: packet-ocsp-hf.c ---*/ - +#line 51 "packet-ocsp-template.c" /* Initialize the subtree pointers */ static gint ett_ocsp = -1; /*--- Included file: packet-ocsp-ett.c ---*/ - +#line 1 "packet-ocsp-ett.c" static gint ett_ocsp_OCSPRequest = -1; static gint ett_ocsp_TBSRequest = -1; static gint ett_ocsp_SEQUENCE_OF_Request = -1; @@ -137,14 +138,14 @@ static gint ett_ocsp_ServiceLocator = -1; static gint ett_ocsp_CrlID = -1; /*--- End of included file: packet-ocsp-ett.c ---*/ - +#line 55 "packet-ocsp-template.c" static const char *responseType_id; /*--- Included file: packet-ocsp-fn.c ---*/ - +#line 1 "packet-ocsp-fn.c" /*--- Fields for imported types ---*/ static int dissect_requestorName(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { @@ -401,6 +402,7 @@ static int dissect_responseType(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_ocsp_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +#line 38 "ocsp.cnf" gint8 class; gboolean pc, ind; gint32 tag; @@ -411,6 +413,7 @@ dissect_ocsp_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa offset=call_ber_oid_callback(responseType_id, tvb, offset, pinfo, tree); + return offset; } static int dissect_response(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { @@ -768,7 +771,7 @@ static void dissect_CrlID_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /*--- End of included file: packet-ocsp-fn.c ---*/ - +#line 60 "packet-ocsp-template.c" static int @@ -831,7 +834,7 @@ void proto_register_ocsp(void) { "ResponseType Id", HFILL }}, /*--- Included file: packet-ocsp-hfarr.c ---*/ - +#line 1 "packet-ocsp-hfarr.c" { &hf_ocsp_BasicOCSPResponse_PDU, { "BasicOCSPResponse", "ocsp.BasicOCSPResponse", FT_NONE, BASE_NONE, NULL, 0, @@ -930,7 +933,7 @@ void proto_register_ocsp(void) { "OCSPResponse/responseBytes", HFILL }}, { &hf_ocsp_responseType, { "responseType", "ocsp.responseType", - FT_STRING, BASE_NONE, NULL, 0, + FT_OID, BASE_NONE, NULL, 0, "ResponseBytes/responseType", HFILL }}, { &hf_ocsp_response, { "response", "ocsp.response", @@ -1010,7 +1013,7 @@ void proto_register_ocsp(void) { "RevokedInfo/revocationReason", HFILL }}, { &hf_ocsp_AcceptableResponses_item, { "Item", "ocsp.AcceptableResponses_item", - FT_STRING, BASE_NONE, NULL, 0, + FT_OID, BASE_NONE, NULL, 0, "AcceptableResponses/_item", HFILL }}, { &hf_ocsp_issuer, { "issuer", "ocsp.issuer", @@ -1034,7 +1037,7 @@ void proto_register_ocsp(void) { "CrlID/crlTime", HFILL }}, /*--- End of included file: packet-ocsp-hfarr.c ---*/ - +#line 121 "packet-ocsp-template.c" }; /* List of subtrees */ @@ -1042,7 +1045,7 @@ void proto_register_ocsp(void) { &ett_ocsp, /*--- Included file: packet-ocsp-ettarr.c ---*/ - +#line 1 "packet-ocsp-ettarr.c" &ett_ocsp_OCSPRequest, &ett_ocsp_TBSRequest, &ett_ocsp_SEQUENCE_OF_Request, @@ -1064,7 +1067,7 @@ void proto_register_ocsp(void) { &ett_ocsp_CrlID, /*--- End of included file: packet-ocsp-ettarr.c ---*/ - +#line 127 "packet-ocsp-template.c" }; /* Register protocol */ @@ -1089,7 +1092,7 @@ void proto_reg_handoff_ocsp(void) { /*--- Included file: packet-ocsp-dis-tab.c ---*/ - +#line 1 "packet-ocsp-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.1", dissect_BasicOCSPResponse_PDU, proto_ocsp, "id-pkix-ocsp-basic"); register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.3", dissect_CrlID_PDU, proto_ocsp, "id-pkix-ocsp-crl"); register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.4", dissect_AcceptableResponses_PDU, proto_ocsp, "id-pkix-ocsp-response"); @@ -1098,6 +1101,6 @@ void proto_reg_handoff_ocsp(void) { /*--- End of included file: packet-ocsp-dis-tab.c ---*/ - +#line 150 "packet-ocsp-template.c" } |