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

diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index 38311c5fd6..825eca161d 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.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-crmf.c                                                              */
-/* ../../tools/asn2wrs.py -b -p crmf -c ./crmf.cnf -s ./packet-crmf-template -D . -O ../../epan/dissectors CRMF.asn */
+/* asn2wrs.py -b -p crmf -c ./crmf.cnf -s ./packet-crmf-template -D . -O ../.. CRMF.asn */
 
 /* Input file: packet-crmf-template.c */
 
-#line 1 "../../asn1/crmf/packet-crmf-template.c"
+#line 1 "./asn1/crmf/packet-crmf-template.c"
 /* packet-crmf.c
  * Routines for RFC2511 Certificate Request Message Format packet dissection
  *   Ronnie Sahlberg 2004
@@ -53,7 +53,7 @@ static int proto_crmf = -1;
 static int hf_crmf_type_oid = -1;
 
 /*--- Included file: packet-crmf-hf.c ---*/
-#line 1 "../../asn1/crmf/packet-crmf-hf.c"
+#line 1 "./asn1/crmf/packet-crmf-hf.c"
 static int hf_crmf_CertRequest_PDU = -1;          /* CertRequest */
 static int hf_crmf_PBMParameter_PDU = -1;         /* PBMParameter */
 static int hf_crmf_RegToken_PDU = -1;             /* RegToken */
@@ -136,12 +136,12 @@ static int hf_crmf_attributes = -1;               /* Attributes */
 static int hf_crmf_Attributes_item = -1;          /* Attribute */
 
 /*--- End of included file: packet-crmf-hf.c ---*/
-#line 47 "../../asn1/crmf/packet-crmf-template.c"
+#line 47 "./asn1/crmf/packet-crmf-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-crmf-ett.c ---*/
-#line 1 "../../asn1/crmf/packet-crmf-ett.c"
+#line 1 "./asn1/crmf/packet-crmf-ett.c"
 static gint ett_crmf_CertReqMessages = -1;
 static gint ett_crmf_CertReqMsg = -1;
 static gint ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue = -1;
@@ -170,10 +170,10 @@ static gint ett_crmf_PrivateKeyInfo = -1;
 static gint ett_crmf_Attributes = -1;
 
 /*--- End of included file: packet-crmf-ett.c ---*/
-#line 50 "../../asn1/crmf/packet-crmf-template.c"
+#line 50 "./asn1/crmf/packet-crmf-template.c"
 
 /*--- Included file: packet-crmf-fn.c ---*/
-#line 1 "../../asn1/crmf/packet-crmf-fn.c"
+#line 1 "./asn1/crmf/packet-crmf-fn.c"
 
 
 static int
@@ -235,7 +235,7 @@ dissect_crmf_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
 
 static int
 dissect_crmf_T_value(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 72 "../../asn1/crmf/crmf.cnf"
+#line 72 "./asn1/crmf/crmf.cnf"
   offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL);
 
 
@@ -903,7 +903,7 @@ static int dissect_EncKeyWithID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
 
 
 /*--- End of included file: packet-crmf-fn.c ---*/
-#line 51 "../../asn1/crmf/packet-crmf-template.c"
+#line 51 "./asn1/crmf/packet-crmf-template.c"
 
 
 /*--- proto_register_crmf ----------------------------------------------*/
@@ -917,7 +917,7 @@ void proto_register_crmf(void) {
         "Type of AttributeTypeAndValue", HFILL }},
 
 /*--- Included file: packet-crmf-hfarr.c ---*/
-#line 1 "../../asn1/crmf/packet-crmf-hfarr.c"
+#line 1 "./asn1/crmf/packet-crmf-hfarr.c"
     { &hf_crmf_CertRequest_PDU,
       { "CertRequest", "crmf.CertRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1240,14 +1240,14 @@ void proto_register_crmf(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-crmf-hfarr.c ---*/
-#line 63 "../../asn1/crmf/packet-crmf-template.c"
+#line 63 "./asn1/crmf/packet-crmf-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-crmf-ettarr.c ---*/
-#line 1 "../../asn1/crmf/packet-crmf-ettarr.c"
+#line 1 "./asn1/crmf/packet-crmf-ettarr.c"
     &ett_crmf_CertReqMessages,
     &ett_crmf_CertReqMsg,
     &ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue,
@@ -1276,7 +1276,7 @@ void proto_register_crmf(void) {
     &ett_crmf_Attributes,
 
 /*--- End of included file: packet-crmf-ettarr.c ---*/
-#line 68 "../../asn1/crmf/packet-crmf-template.c"
+#line 68 "./asn1/crmf/packet-crmf-template.c"
   };
 
   /* Register protocol */
@@ -1296,7 +1296,7 @@ void proto_reg_handoff_crmf(void) {
 	oid_add_from_string("id-regInfo","1.3.6.1.5.5.7.5.2");
 
 /*--- Included file: packet-crmf-dis-tab.c ---*/
-#line 1 "../../asn1/crmf/packet-crmf-dis-tab.c"
+#line 1 "./asn1/crmf/packet-crmf-dis-tab.c"
   register_ber_oid_dissector("1.2.840.113549.1.9.16.1.21", dissect_EncKeyWithID_PDU, proto_crmf, "id-ct-encKeyWithID");
   register_ber_oid_dissector("1.2.840.113533.7.66.13", dissect_PBMParameter_PDU, proto_crmf, "PasswordBasedMac");
   register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.1", dissect_RegToken_PDU, proto_crmf, "id-regCtrl-regToken");
@@ -1310,6 +1310,6 @@ void proto_reg_handoff_crmf(void) {
 
 
 /*--- End of included file: packet-crmf-dis-tab.c ---*/
-#line 86 "../../asn1/crmf/packet-crmf-template.c"
+#line 86 "./asn1/crmf/packet-crmf-template.c"
 }