Move /asn1 to /epan/dissectors

Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9
Reviewed-on: https://code.wireshark.org/review/14388
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>

1 files changed, 16 insertions, 16 deletions

diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 0dd52de03e..69e8c16f72 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.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-ocsp.c                                                              */
-/* ../../tools/asn2wrs.py -b -p ocsp -c ./ocsp.cnf -s ./packet-ocsp-template -D . -O ../../epan/dissectors OCSP.asn */
+/* asn2wrs.py -b -p ocsp -c ./ocsp.cnf -s ./packet-ocsp-template -D . -O ../.. OCSP.asn */
 
 /* Input file: packet-ocsp-template.c */
 
-#line 1 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 1 "./asn1/ocsp/packet-ocsp-template.c"
 /* packet-ocsp.c
  * Routines for Online Certificate Status Protocol (RFC2560) packet dissection
  *  Ronnie Sahlberg 2004
@@ -54,7 +54,7 @@ int proto_ocsp = -1;
 static int hf_ocsp_responseType_id = -1;
 
 /*--- Included file: packet-ocsp-hf.c ---*/
-#line 1 "../../asn1/ocsp/packet-ocsp-hf.c"
+#line 1 "./asn1/ocsp/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 +109,13 @@ static int hf_ocsp_crlNum = -1;                   /* INTEGER */
 static int hf_ocsp_crlTime = -1;                  /* GeneralizedTime */
 
 /*--- End of included file: packet-ocsp-hf.c ---*/
-#line 48 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 48 "./asn1/ocsp/packet-ocsp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_ocsp = -1;
 
 /*--- Included file: packet-ocsp-ett.c ---*/
-#line 1 "../../asn1/ocsp/packet-ocsp-ett.c"
+#line 1 "./asn1/ocsp/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,11 +137,11 @@ static gint ett_ocsp_ServiceLocator = -1;
 static gint ett_ocsp_CrlID = -1;
 
 /*--- End of included file: packet-ocsp-ett.c ---*/
-#line 52 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 52 "./asn1/ocsp/packet-ocsp-template.c"
 
 
 /*--- Included file: packet-ocsp-fn.c ---*/
-#line 1 "../../asn1/ocsp/packet-ocsp-fn.c"
+#line 1 "./asn1/ocsp/packet-ocsp-fn.c"
 
 
 static int
@@ -303,7 +303,7 @@ dissect_ocsp_OCSPResponseStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_ocsp_T_responseType(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 40 "../../asn1/ocsp/ocsp.cnf"
+#line 40 "./asn1/ocsp/ocsp.cnf"
   offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_ocsp_responseType_id, &actx->external.direct_reference);
 
   actx->external.direct_ref_present = (actx->external.direct_reference != NULL) ? TRUE : FALSE;
@@ -317,7 +317,7 @@ dissect_ocsp_T_responseType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_ocsp_T_response(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 44 "../../asn1/ocsp/ocsp.cnf"
+#line 44 "./asn1/ocsp/ocsp.cnf"
   gint8 appclass;
   gboolean pc, ind;
   gint32 tag;
@@ -675,7 +675,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre
 
 
 /*--- End of included file: packet-ocsp-fn.c ---*/
-#line 54 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 54 "./asn1/ocsp/packet-ocsp-template.c"
 
 
 static int
@@ -732,7 +732,7 @@ void proto_register_ocsp(void) {
         NULL, HFILL }},
 
 /*--- Included file: packet-ocsp-hfarr.c ---*/
-#line 1 "../../asn1/ocsp/packet-ocsp-hfarr.c"
+#line 1 "./asn1/ocsp/packet-ocsp-hfarr.c"
     { &hf_ocsp_BasicOCSPResponse_PDU,
       { "BasicOCSPResponse", "ocsp.BasicOCSPResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -943,7 +943,7 @@ void proto_register_ocsp(void) {
         "GeneralizedTime", HFILL }},
 
 /*--- End of included file: packet-ocsp-hfarr.c ---*/
-#line 109 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 109 "./asn1/ocsp/packet-ocsp-template.c"
   };
 
   /* List of subtrees */
@@ -951,7 +951,7 @@ void proto_register_ocsp(void) {
     &ett_ocsp,
 
 /*--- Included file: packet-ocsp-ettarr.c ---*/
-#line 1 "../../asn1/ocsp/packet-ocsp-ettarr.c"
+#line 1 "./asn1/ocsp/packet-ocsp-ettarr.c"
     &ett_ocsp_OCSPRequest,
     &ett_ocsp_TBSRequest,
     &ett_ocsp_SEQUENCE_OF_Request,
@@ -973,7 +973,7 @@ void proto_register_ocsp(void) {
     &ett_ocsp_CrlID,
 
 /*--- End of included file: packet-ocsp-ettarr.c ---*/
-#line 115 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 115 "./asn1/ocsp/packet-ocsp-template.c"
   };
 
   /* Register protocol */
@@ -998,7 +998,7 @@ void proto_reg_handoff_ocsp(void) {
 
 
 /*--- Included file: packet-ocsp-dis-tab.c ---*/
-#line 1 "../../asn1/ocsp/packet-ocsp-dis-tab.c"
+#line 1 "./asn1/ocsp/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.2", dissect_ReOcspNonce_PDU, proto_ocsp, "id-pkix-ocsp-nonce");
   register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.3", dissect_CrlID_PDU, proto_ocsp, "id-pkix-ocsp-crl");
@@ -1009,6 +1009,6 @@ void proto_reg_handoff_ocsp(void) {
 
 
 /*--- End of included file: packet-ocsp-dis-tab.c ---*/
-#line 138 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 138 "./asn1/ocsp/packet-ocsp-template.c"
 }