From 54a520d4a1151c68d0b4e5f09a8d82466fa499f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Wed, 9 Mar 2016 03:17:51 +0000 Subject: Move /asn1 to /epan/dissectors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Reviewed-by: João Valverde --- epan/dissectors/packet-pkixproxy.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'epan/dissectors/packet-pkixproxy.c') diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index efc40fd2ea..4280f9309a 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -1,11 +1,11 @@ /* Do not modify this file. Changes will be overwritten. */ /* Generated automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkixproxy.c */ -/* ../../tools/asn2wrs.py -b -p pkixproxy -c ./pkixproxy.cnf -s ./packet-pkixproxy-template -D . -O ../../epan/dissectors PKIXProxy.asn */ +/* asn2wrs.py -b -p pkixproxy -c ./pkixproxy.cnf -s ./packet-pkixproxy-template -D . -O ../.. PKIXProxy.asn */ /* Input file: packet-pkixproxy-template.c */ -#line 1 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 1 "./asn1/pkixproxy/packet-pkixproxy-template.c" /* packet-pkixproxy.c * Routines for RFC3820 PKIXProxy packet dissection * Ronnie Sahlberg 2004 @@ -49,7 +49,7 @@ void proto_reg_handoff_pkixproxy(void); static int proto_pkixproxy = -1; /*--- Included file: packet-pkixproxy-hf.c ---*/ -#line 1 "../../asn1/pkixproxy/packet-pkixproxy-hf.c" +#line 1 "./asn1/pkixproxy/packet-pkixproxy-hf.c" static int hf_pkixproxy_ProxyCertInfoExtension_PDU = -1; /* ProxyCertInfoExtension */ static int hf_pkixproxy_pCPathLenConstraint = -1; /* ProxyCertPathLengthConstraint */ static int hf_pkixproxy_proxyPolicy = -1; /* ProxyPolicy */ @@ -57,21 +57,21 @@ static int hf_pkixproxy_policyLanguage = -1; /* OBJECT_IDENTIFIER */ static int hf_pkixproxy_policy = -1; /* OCTET_STRING */ /*--- End of included file: packet-pkixproxy-hf.c ---*/ -#line 43 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 43 "./asn1/pkixproxy/packet-pkixproxy-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-pkixproxy-ett.c ---*/ -#line 1 "../../asn1/pkixproxy/packet-pkixproxy-ett.c" +#line 1 "./asn1/pkixproxy/packet-pkixproxy-ett.c" static gint ett_pkixproxy_ProxyCertInfoExtension = -1; static gint ett_pkixproxy_ProxyPolicy = -1; /*--- End of included file: packet-pkixproxy-ett.c ---*/ -#line 46 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 46 "./asn1/pkixproxy/packet-pkixproxy-template.c" /*--- Included file: packet-pkixproxy-fn.c ---*/ -#line 1 "../../asn1/pkixproxy/packet-pkixproxy-fn.c" +#line 1 "./asn1/pkixproxy/packet-pkixproxy-fn.c" static int @@ -143,7 +143,7 @@ static int dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-pkixproxy-fn.c ---*/ -#line 48 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 48 "./asn1/pkixproxy/packet-pkixproxy-template.c" /*--- proto_register_pkixproxy ----------------------------------------------*/ @@ -153,7 +153,7 @@ void proto_register_pkixproxy(void) { static hf_register_info hf[] = { /*--- Included file: packet-pkixproxy-hfarr.c ---*/ -#line 1 "../../asn1/pkixproxy/packet-pkixproxy-hfarr.c" +#line 1 "./asn1/pkixproxy/packet-pkixproxy-hfarr.c" { &hf_pkixproxy_ProxyCertInfoExtension_PDU, { "ProxyCertInfoExtension", "pkixproxy.ProxyCertInfoExtension_element", FT_NONE, BASE_NONE, NULL, 0, @@ -176,19 +176,19 @@ void proto_register_pkixproxy(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-pkixproxy-hfarr.c ---*/ -#line 56 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 56 "./asn1/pkixproxy/packet-pkixproxy-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-pkixproxy-ettarr.c ---*/ -#line 1 "../../asn1/pkixproxy/packet-pkixproxy-ettarr.c" +#line 1 "./asn1/pkixproxy/packet-pkixproxy-ettarr.c" &ett_pkixproxy_ProxyCertInfoExtension, &ett_pkixproxy_ProxyPolicy, /*--- End of included file: packet-pkixproxy-ettarr.c ---*/ -#line 61 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 61 "./asn1/pkixproxy/packet-pkixproxy-template.c" }; /* Register protocol */ @@ -205,12 +205,12 @@ void proto_register_pkixproxy(void) { void proto_reg_handoff_pkixproxy(void) { /*--- Included file: packet-pkixproxy-dis-tab.c ---*/ -#line 1 "../../asn1/pkixproxy/packet-pkixproxy-dis-tab.c" +#line 1 "./asn1/pkixproxy/packet-pkixproxy-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.1.14", dissect_ProxyCertInfoExtension_PDU, proto_pkixproxy, "id-pe-proxyCertInfo"); /*--- End of included file: packet-pkixproxy-dis-tab.c ---*/ -#line 76 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 76 "./asn1/pkixproxy/packet-pkixproxy-template.c" oid_add_from_string("id-ppl-anyLanguage","1.3.6.1.5.5.7.21.0"); oid_add_from_string("id-ppl-inheritAll","1.3.6.1.5.5.7.21.1"); oid_add_from_string("id-ppl-independent","1.3.6.1.5.5.7.21.2"); -- cgit v1.2.3