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, 17 insertions, 17 deletions

diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index b53eb3cfe1..91fe979703 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.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-cmp.c                                                               */
-/* ../../tools/asn2wrs.py -b -p cmp -c ./cmp.cnf -s ./packet-cmp-template -D . -O ../../epan/dissectors CMP.asn */
+/* asn2wrs.py -b -p cmp -c ./cmp.cnf -s ./packet-cmp-template -D . -O ../.. CMP.asn */
 
 /* Input file: packet-cmp-template.c */
 
-#line 1 "../../asn1/cmp/packet-cmp-template.c"
+#line 1 "./asn1/cmp/packet-cmp-template.c"
 /* packet-cmp.c
  *
  * Routines for RFC2510 Certificate Management Protocol packet dissection
@@ -74,7 +74,7 @@ static int hf_cmp_tcptrans10_version = -1;
 static int hf_cmp_tcptrans10_flags = -1;
 
 /*--- Included file: packet-cmp-hf.c ---*/
-#line 1 "../../asn1/cmp/packet-cmp-hf.c"
+#line 1 "./asn1/cmp/packet-cmp-hf.c"
 static int hf_cmp_PBMParameter_PDU = -1;          /* PBMParameter */
 static int hf_cmp_DHBMParameter_PDU = -1;         /* DHBMParameter */
 static int hf_cmp_CAProtEncCertValue_PDU = -1;    /* CAProtEncCertValue */
@@ -235,13 +235,13 @@ static int hf_cmp_PKIFailureInfo_systemFailure = -1;
 static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1;
 
 /*--- End of included file: packet-cmp-hf.c ---*/
-#line 68 "../../asn1/cmp/packet-cmp-template.c"
+#line 68 "./asn1/cmp/packet-cmp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_cmp = -1;
 
 /*--- Included file: packet-cmp-ett.c ---*/
-#line 1 "../../asn1/cmp/packet-cmp-ett.c"
+#line 1 "./asn1/cmp/packet-cmp-ett.c"
 static gint ett_cmp_CMPCertificate = -1;
 static gint ett_cmp_PKIMessage = -1;
 static gint ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CMPCertificate = -1;
@@ -291,10 +291,10 @@ static gint ett_cmp_PollRepContent = -1;
 static gint ett_cmp_PollRepContent_item = -1;
 
 /*--- End of included file: packet-cmp-ett.c ---*/
-#line 72 "../../asn1/cmp/packet-cmp-template.c"
+#line 72 "./asn1/cmp/packet-cmp-template.c"
 
 /*--- Included file: packet-cmp-fn.c ---*/
-#line 1 "../../asn1/cmp/packet-cmp-fn.c"
+#line 1 "./asn1/cmp/packet-cmp-fn.c"
 /*--- Cyclic dependencies ---*/
 
 /* PKIMessage -> PKIBody -> NestedMessageContent -> PKIMessages -> PKIMessage */
@@ -393,7 +393,7 @@ dissect_cmp_T_infoType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_cmp_T_infoValue(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 88 "../../asn1/cmp/cmp.cnf"
+#line 88 "./asn1/cmp/cmp.cnf"
   offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL);
 
 
@@ -492,7 +492,7 @@ const value_string cmp_PKIStatus_vals[] = {
 
 int
 dissect_cmp_PKIStatus(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 104 "../../asn1/cmp/cmp.cnf"
+#line 104 "./asn1/cmp/cmp.cnf"
   guint32 value;
 
     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
@@ -1089,7 +1089,7 @@ static const ber_choice_t PKIBody_choice[] = {
 
 int
 dissect_cmp_PKIBody(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 94 "../../asn1/cmp/cmp.cnf"
+#line 94 "./asn1/cmp/cmp.cnf"
   gint branch_taken;
 
     offset = dissect_ber_choice(actx, tree, tvb, offset,
@@ -1483,7 +1483,7 @@ static int dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
 
 
 /*--- End of included file: packet-cmp-fn.c ---*/
-#line 73 "../../asn1/cmp/packet-cmp-template.c"
+#line 73 "./asn1/cmp/packet-cmp-template.c"
 
 static int
 dissect_cmp_pdu(tvbuff_t *tvb, proto_tree *tree, asn1_ctx_t *actx)
@@ -1737,7 +1737,7 @@ void proto_register_cmp(void) {
 				"TCP transport flags", HFILL }},
 
 /*--- Included file: packet-cmp-hfarr.c ---*/
-#line 1 "../../asn1/cmp/packet-cmp-hfarr.c"
+#line 1 "./asn1/cmp/packet-cmp-hfarr.c"
     { &hf_cmp_PBMParameter_PDU,
       { "PBMParameter", "cmp.PBMParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2368,7 +2368,7 @@ void proto_register_cmp(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-cmp-hfarr.c ---*/
-#line 325 "../../asn1/cmp/packet-cmp-template.c"
+#line 325 "./asn1/cmp/packet-cmp-template.c"
 	};
 
 	/* List of subtrees */
@@ -2376,7 +2376,7 @@ void proto_register_cmp(void) {
 		&ett_cmp,
 
 /*--- Included file: packet-cmp-ettarr.c ---*/
-#line 1 "../../asn1/cmp/packet-cmp-ettarr.c"
+#line 1 "./asn1/cmp/packet-cmp-ettarr.c"
     &ett_cmp_CMPCertificate,
     &ett_cmp_PKIMessage,
     &ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CMPCertificate,
@@ -2426,7 +2426,7 @@ void proto_register_cmp(void) {
     &ett_cmp_PollRepContent_item,
 
 /*--- End of included file: packet-cmp-ettarr.c ---*/
-#line 331 "../../asn1/cmp/packet-cmp-template.c"
+#line 331 "./asn1/cmp/packet-cmp-template.c"
 	};
 	module_t *cmp_module;
 
@@ -2498,7 +2498,7 @@ void proto_reg_handoff_cmp(void) {
 
 
 /*--- Included file: packet-cmp-dis-tab.c ---*/
-#line 1 "../../asn1/cmp/packet-cmp-dis-tab.c"
+#line 1 "./asn1/cmp/packet-cmp-dis-tab.c"
   register_ber_oid_dissector("1.2.840.113533.7.66.13", dissect_PBMParameter_PDU, proto_cmp, "id-PasswordBasedMac");
   register_ber_oid_dissector("1.2.640.113533.7.66.30", dissect_DHBMParameter_PDU, proto_cmp, "id-DHBasedMac");
   register_ber_oid_dissector("1.3.6.1.5.5.7.4.1", dissect_CAProtEncCertValue_PDU, proto_cmp, "id-it-caProtEncCert");
@@ -2518,7 +2518,7 @@ void proto_reg_handoff_cmp(void) {
 
 
 /*--- End of included file: packet-cmp-dis-tab.c ---*/
-#line 401 "../../asn1/cmp/packet-cmp-template.c"
+#line 401 "./asn1/cmp/packet-cmp-template.c"
 		inited = TRUE;
 	}