Include <epan/oid_resolv.h> to declare get_oid_str_name().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18627 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/cdt/cdt-exp.cnf b/asn1/cdt/cdt-exp.cnf
index 57d8607f11c321f44df8263c3016f0dbaea4cda2..259c10aaae4d625479febe87e2e27276db6bf253 100644 (file)
--- a/asn1/cdt/cdt-exp.cnf
+++ b/asn1/cdt/cdt-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler

-# .\cdt-exp.cnf
+# ./cdt-exp.cnf

 # ../../tools/asn2wrs.py -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn
 
 #.MODULE
 # ../../tools/asn2wrs.py -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn
 
 #.MODULE

diff --git a/asn1/cdt/packet-cdt-template.c b/asn1/cdt/packet-cdt-template.c
index 3a9750dcbbc4ad1506333796866ee6727a11705b..51ca1685ed34c20c388355be6369f5b2a3b87f43 100644 (file)
--- a/asn1/cdt/packet-cdt-template.c
+++ b/asn1/cdt/packet-cdt-template.c
@@ -32,6 +32,7 @@
 #endif
 
 #include <epan/packet.h>
 #endif
 
 #include <epan/packet.h>

+#include <epan/oid_resolv.h>

 
 #include "packet-ber.h"
 #include "packet-x411.h"
 
 #include "packet-ber.h"
 #include "packet-x411.h"

diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf
index 03c3c94086e2e3a36c1b4e6bef133440526e3347..5d7aa8672b8b2d3b046aec7fdd29c26947c8fd5d 100644 (file)
--- a/asn1/cms/cms-exp.cnf
+++ b/asn1/cms/cms-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler

-# .\cms-exp.cnf
+# ./cms-exp.cnf

 # ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn
 
 #.MODULE
 # ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn
 
 #.MODULE

diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c
index a2c381b7a2a3b162b1e546cb1ecb18c8caa939a3..d8bda3f085d2dd0832585a7d5e722a92aade9ccc 100644 (file)
--- a/asn1/cms/packet-cms-template.c
+++ b/asn1/cms/packet-cms-template.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>

+#include <epan/oid_resolv.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/asn1/x420/packet-x420-template.c b/asn1/x420/packet-x420-template.c
index 290f389c70f438262f61ff3fac1d6af10369c57f..f99f31dc774c6b636df06e8571ab33605e2dce1b 100644 (file)
--- a/asn1/x420/packet-x420-template.c
+++ b/asn1/x420/packet-x420-template.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>

+#include <epan/oid_resolv.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/asn1/x420/x420-exp.cnf b/asn1/x420/x420-exp.cnf
index 2e0a43f5353432948a36061f7654bfc7ee74c173..1ef3330743d6c4968d6cd9f21ae3666ea6898b29 100644 (file)
--- a/asn1/x420/x420-exp.cnf
+++ b/asn1/x420/x420-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler

-# .\x420-exp.cnf
+# ./x420-exp.cnf

 # ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn
 
 #.MODULE
 # ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn
 
 #.MODULE

diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index 50c0feb05ab28a253cbe2964884a10c84d9f1f99..f8ac215681906843d07d8c4fbdac51b493da6e13 100644 (file)
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>

+#include <epan/oid_resolv.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/asn1/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf
index 6be2ac9936b2db51e0b385f1004c6eefb7083a32..817623089f6d33a8a7b9229ce0290817ad1d98bd 100644 (file)
--- a/asn1/x509af/x509af-exp.cnf
+++ b/asn1/x509af/x509af-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler

-# .\x509af-exp.cnf
+# ./x509af-exp.cnf

 # ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn
 
 #.MODULE
 # ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn
 
 #.MODULE

diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c
index 9a6511172060031ba29f1de8d6cf937799df36c5..5e8926a048e3f648d4de10ad75c16887ed85050b 100644 (file)
--- a/asn1/x509if/packet-x509if-template.c
+++ b/asn1/x509if/packet-x509if-template.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>

+#include <epan/oid_resolv.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/asn1/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf
index 4a1907e8a45b4b343ecf80c9b7281c9a48a2a654..d83732262e9e389650cb5adf977b80c0c3c0180c 100644 (file)
--- a/asn1/x509if/x509if-exp.cnf
+++ b/asn1/x509if/x509if-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler

-# .\x509if-exp.cnf
+# ./x509if-exp.cnf

 # ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn
 
 #.MODULE
 # ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn
 
 #.MODULE

diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c
index 4cab9936093b7df0d0ca9eee59a33dce615ffec0..0bdc0bd4a90cfa8d6df00148e46f33cc7eee9e44 100644 (file)
--- a/epan/dissectors/packet-cdt.c
+++ b/epan/dissectors/packet-cdt.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */

-/* .\packet-cdt.c                                                             */
+/* ./packet-cdt.c                                                             */

 /* ../../tools/asn2wrs.py -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */
 
 /* Input file: packet-cdt-template.c */
 /* ../../tools/asn2wrs.py -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */
 
 /* Input file: packet-cdt-template.c */


@@ -40,6 +40,7 @@
 #endif
 
 #include <epan/packet.h>
 #endif
 
 #include <epan/packet.h>

+#include <epan/oid_resolv.h>

 
 #include "packet-ber.h"
 #include "packet-x411.h"
 
 #include "packet-ber.h"
 #include "packet-x411.h"


@@ -67,7 +68,7 @@ static int hf_cdt_contentType_OID = -1;           /* OBJECT_IDENTIFIER */
 static int hf_cdt_compressedContent = -1;         /* CompressedContent */
 
 /*--- End of included file: packet-cdt-hf.c ---*/
 static int hf_cdt_compressedContent = -1;         /* CompressedContent */
 
 /*--- End of included file: packet-cdt-hf.c ---*/

-#line 49 "packet-cdt-template.c"
+#line 50 "packet-cdt-template.c"

 
 /* Initialize the subtree pointers */
 
 
 /* Initialize the subtree pointers */
 


@@ -79,7 +80,7 @@ static gint ett_cdt_CompressedContentInfo = -1;
 static gint ett_cdt_T_contentType = -1;
 
 /*--- End of included file: packet-cdt-ett.c ---*/
 static gint ett_cdt_T_contentType = -1;
 
 /*--- End of included file: packet-cdt-ett.c ---*/

-#line 52 "packet-cdt-template.c"
+#line 53 "packet-cdt-template.c"

 
 
 /*--- Included file: packet-cdt-fn.c ---*/
 
 
 /*--- Included file: packet-cdt-fn.c ---*/


@@ -323,7 +324,7 @@ static void dissect_CompressedData_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_
 
 
 /*--- End of included file: packet-cdt-fn.c ---*/
 
 
 /*--- End of included file: packet-cdt-fn.c ---*/

-#line 54 "packet-cdt-template.c"
+#line 55 "packet-cdt-template.c"

 
 
 /*--- proto_register_cdt -------------------------------------------*/
 
 
 /*--- proto_register_cdt -------------------------------------------*/


@@ -396,7 +397,7 @@ void proto_register_cdt (void) {
         "CompressedContentInfo/compressedContent", HFILL }},
 
 /*--- End of included file: packet-cdt-hfarr.c ---*/
         "CompressedContentInfo/compressedContent", HFILL }},
 
 /*--- End of included file: packet-cdt-hfarr.c ---*/

-#line 86 "packet-cdt-template.c"
+#line 87 "packet-cdt-template.c"

   };
 
   /* List of subtrees */
   };
 
   /* List of subtrees */


@@ -410,7 +411,7 @@ void proto_register_cdt (void) {
     &ett_cdt_T_contentType,
 
 /*--- End of included file: packet-cdt-ettarr.c ---*/
     &ett_cdt_T_contentType,
 
 /*--- End of included file: packet-cdt-ettarr.c ---*/

-#line 91 "packet-cdt-template.c"
+#line 92 "packet-cdt-template.c"

   };
 
   /* Register protocol */
   };
 
   /* Register protocol */


@@ -432,5 +433,5 @@ void proto_reg_handoff_cdt (void) {
 
 
 /*--- End of included file: packet-cdt-dis-tab.c ---*/
 
 
 /*--- End of included file: packet-cdt-dis-tab.c ---*/

-#line 106 "packet-cdt-template.c"
+#line 107 "packet-cdt-template.c"

 }
 }

diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 98093da61e0c1933d8f79cad4e51af68cbf0ac29..2a587c7eda7c470ffb85fd544df95aad1e9c8b25 100644 (file)
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */

-/* .\packet-cms.c                                                             */
+/* ./packet-cms.c                                                             */

 /* ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
 
 /* Input file: packet-cms-template.c */
 /* ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
 
 /* Input file: packet-cms-template.c */


@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>

+#include <epan/oid_resolv.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -147,7 +148,7 @@ static int hf_cms_signature = -1;                 /* Signature */
 static int hf_cms_attributes = -1;                /* UnauthAttributes */
 
 /*--- End of included file: packet-cms-hf.c ---*/
 static int hf_cms_attributes = -1;                /* UnauthAttributes */
 
 /*--- End of included file: packet-cms-hf.c ---*/

-#line 53 "packet-cms-template.c"
+#line 54 "packet-cms-template.c"

 
 /* Initialize the subtree pointers */
 
 
 /* Initialize the subtree pointers */
 


@@ -196,7 +197,7 @@ static gint ett_cms_ExtendedCertificate = -1;
 static gint ett_cms_ExtendedCertificateInfo = -1;
 
 /*--- End of included file: packet-cms-ett.c ---*/
 static gint ett_cms_ExtendedCertificateInfo = -1;
 
 /*--- End of included file: packet-cms-ett.c ---*/

-#line 56 "packet-cms-template.c"
+#line 57 "packet-cms-template.c"

 
 static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */
 
 
 static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */
 


@@ -1590,7 +1591,7 @@ static void dissect_Countersignature_PDU(tvbuff_t *tvb, packet_info *pinfo, prot
 
 
 /*--- End of included file: packet-cms-fn.c ---*/
 
 
 /*--- End of included file: packet-cms-fn.c ---*/

-#line 133 "packet-cms-template.c"
+#line 134 "packet-cms-template.c"

 
 /*--- proto_register_cms ----------------------------------------------*/
 void proto_register_cms(void) {
 
 /*--- proto_register_cms ----------------------------------------------*/
 void proto_register_cms(void) {


@@ -1946,7 +1947,7 @@ void proto_register_cms(void) {
         "ExtendedCertificateInfo/attributes", HFILL }},
 
 /*--- End of included file: packet-cms-hfarr.c ---*/
         "ExtendedCertificateInfo/attributes", HFILL }},
 
 /*--- End of included file: packet-cms-hfarr.c ---*/

-#line 144 "packet-cms-template.c"
+#line 145 "packet-cms-template.c"

   };
 
   /* List of subtrees */
   };
 
   /* List of subtrees */


@@ -1997,7 +1998,7 @@ void proto_register_cms(void) {
     &ett_cms_ExtendedCertificateInfo,
 
 /*--- End of included file: packet-cms-ettarr.c ---*/
     &ett_cms_ExtendedCertificateInfo,
 
 /*--- End of included file: packet-cms-ettarr.c ---*/

-#line 149 "packet-cms-template.c"
+#line 150 "packet-cms-template.c"

   };
 
   /* Register protocol */
   };
 
   /* Register protocol */


@@ -2029,6 +2030,6 @@ void proto_reg_handoff_cms(void) {
 
 
 /*--- End of included file: packet-cms-dis-tab.c ---*/
 
 
 /*--- End of included file: packet-cms-dis-tab.c ---*/

-#line 164 "packet-cms-template.c"
+#line 165 "packet-cms-template.c"

 }
 
 }
 

diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index 150ed0fef2acb6f612e22da0195c32ca8234129a..3eacf857ca5c40e306b261fabc7ddf7609ee7c31 100644 (file)
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */

-/* .\packet-x420.c                                                            */
+/* ./packet-x420.c                                                            */

 /* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */
 
 /* Input file: packet-x420-template.c */
 /* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */
 
 /* Input file: packet-x420-template.c */


@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>

+#include <epan/oid_resolv.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -295,7 +296,7 @@ static int hf_x420_NotificationRequests_an_supported = -1;
 static int hf_x420_NotificationRequests_suppress_an = -1;
 
 /*--- End of included file: packet-x420-hf.c ---*/
 static int hf_x420_NotificationRequests_suppress_an = -1;
 
 /*--- End of included file: packet-x420-hf.c ---*/

-#line 86 "packet-x420-template.c"
+#line 87 "packet-x420-template.c"

 
 /* Initialize the subtree pointers */
 static gint ett_x420 = -1;
 
 /* Initialize the subtree pointers */
 static gint ett_x420 = -1;


@@ -375,7 +376,7 @@ static gint ett_x420_ForwardedContentParameters = -1;
 static gint ett_x420_SubmissionProof = -1;
 
 /*--- End of included file: packet-x420-ett.c ---*/
 static gint ett_x420_SubmissionProof = -1;
 
 /*--- End of included file: packet-x420-ett.c ---*/

-#line 90 "packet-x420-template.c"
+#line 91 "packet-x420-template.c"

 
 
 /*--- Included file: packet-x420-fn.c ---*/
 
 
 /*--- Included file: packet-x420-fn.c ---*/


@@ -2910,7 +2911,7 @@ static void dissect_ForwardedContentParameters_PDU(tvbuff_t *tvb, packet_info *p
 
 
 /*--- End of included file: packet-x420-fn.c ---*/
 
 
 /*--- End of included file: packet-x420-fn.c ---*/

-#line 92 "packet-x420-template.c"
+#line 93 "packet-x420-template.c"

 
 /*
 * Dissect X420 PDUs inside a PPDU.
 
 /*
 * Dissect X420 PDUs inside a PPDU.


@@ -3743,7 +3744,7 @@ void proto_register_x420(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-x420-hfarr.c ---*/
         "", HFILL }},
 
 /*--- End of included file: packet-x420-hfarr.c ---*/

-#line 124 "packet-x420-template.c"
+#line 125 "packet-x420-template.c"

   };
 
   /* List of subtrees */
   };
 
   /* List of subtrees */


@@ -3825,7 +3826,7 @@ void proto_register_x420(void) {
     &ett_x420_SubmissionProof,
 
 /*--- End of included file: packet-x420-ettarr.c ---*/
     &ett_x420_SubmissionProof,
 
 /*--- End of included file: packet-x420-ettarr.c ---*/

-#line 130 "packet-x420-template.c"
+#line 131 "packet-x420-template.c"

   };
 
   /* Register protocol */
   };
 
   /* Register protocol */


@@ -3892,7 +3893,7 @@ void proto_reg_handoff_x420(void) {
 
 
 /*--- End of included file: packet-x420-dis-tab.c ---*/
 
 
 /*--- End of included file: packet-x420-dis-tab.c ---*/

-#line 146 "packet-x420-template.c"
+#line 147 "packet-x420-template.c"

 
   register_ber_oid_dissector("2.6.1.10.0", dissect_x420, proto_x420, "InterPersonal Message (1984)");
   register_ber_oid_dissector("2.6.1.10.1", dissect_x420, proto_x420, "InterPersonal Message (1988)");
 
   register_ber_oid_dissector("2.6.1.10.0", dissect_x420, proto_x420, "InterPersonal Message (1984)");
   register_ber_oid_dissector("2.6.1.10.1", dissect_x420, proto_x420, "InterPersonal Message (1988)");

diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index bdce26e3ad571cdb31398efb2d6805acfa90c99d..e1d4c653432c18bfff7415510fe3ec90dd6522b6 100644 (file)
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */

-/* .\packet-x509af.c                                                          */
+/* ./packet-x509af.c                                                          */

 /* ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
 
 /* Input file: packet-x509af-template.c */
 /* ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
 
 /* Input file: packet-x509af-template.c */


@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>

+#include <epan/oid_resolv.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -136,7 +137,7 @@ static int hf_x509af_q = -1;                      /* INTEGER */
 static int hf_x509af_g = -1;                      /* INTEGER */
 
 /*--- End of included file: packet-x509af-hf.c ---*/
 static int hf_x509af_g = -1;                      /* INTEGER */
 
 /*--- End of included file: packet-x509af-hf.c ---*/

-#line 53 "packet-x509af-template.c"
+#line 54 "packet-x509af-template.c"

 
 /* Initialize the subtree pointers */
 static gint ett_pkix_crl = -1;
 
 /* Initialize the subtree pointers */
 static gint ett_pkix_crl = -1;


@@ -177,7 +178,7 @@ static gint ett_x509af_SET_OF_AttributeType = -1;
 static gint ett_x509af_DSS_Params = -1;
 
 /*--- End of included file: packet-x509af-ett.c ---*/
 static gint ett_x509af_DSS_Params = -1;
 
 /*--- End of included file: packet-x509af-ett.c ---*/

-#line 57 "packet-x509af-template.c"
+#line 58 "packet-x509af-template.c"

 
 static const char *algorithm_id;
 static const char *extension_id;
 
 static const char *algorithm_id;
 static const char *extension_id;


@@ -1093,7 +1094,7 @@ static void dissect_DSS_Params_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
 
 /*--- End of included file: packet-x509af-fn.c ---*/
 
 
 /*--- End of included file: packet-x509af-fn.c ---*/

-#line 62 "packet-x509af-template.c"
+#line 63 "packet-x509af-template.c"

 
 const char *x509af_get_last_algorithm_id(void) {
   return algorithm_id;
 
 const char *x509af_get_last_algorithm_id(void) {
   return algorithm_id;


@@ -1438,7 +1439,7 @@ void proto_register_x509af(void) {
         "DSS-Params/g", HFILL }},
 
 /*--- End of included file: packet-x509af-hfarr.c ---*/
         "DSS-Params/g", HFILL }},
 
 /*--- End of included file: packet-x509af-hfarr.c ---*/

-#line 106 "packet-x509af-template.c"
+#line 107 "packet-x509af-template.c"

   };
 
   /* List of subtrees */
   };
 
   /* List of subtrees */


@@ -1481,7 +1482,7 @@ void proto_register_x509af(void) {
     &ett_x509af_DSS_Params,
 
 /*--- End of included file: packet-x509af-ettarr.c ---*/
     &ett_x509af_DSS_Params,
 
 /*--- End of included file: packet-x509af-ettarr.c ---*/

-#line 112 "packet-x509af-template.c"
+#line 113 "packet-x509af-template.c"

   };
 
   /* Register protocol */
   };
 
   /* Register protocol */


@@ -1515,7 +1516,7 @@ void proto_reg_handoff_x509af(void) {
 
 
 /*--- End of included file: packet-x509af-dis-tab.c ---*/
 
 
 /*--- End of included file: packet-x509af-dis-tab.c ---*/

-#line 132 "packet-x509af-template.c"
+#line 133 "packet-x509af-template.c"

 
        /*XXX these should really go to a better place but since that
          I have not that ITU standard, ill put it here for the time
 
        /*XXX these should really go to a better place but since that
          I have not that ITU standard, ill put it here for the time

diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 74a3e34579faf9e66ea77552ead6d318f88ec2ed..34072efbec02ced9de3589b58e285cc81f4511b9 100644 (file)
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */

-/* .\packet-x509if.c                                                          */
+/* ./packet-x509if.c                                                          */

 /* ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
 
 /* Input file: packet-x509if-template.c */
 /* ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
 
 /* Input file: packet-x509if-template.c */


@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>

+#include <epan/oid_resolv.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -203,7 +204,7 @@ static int hf_x509if_AllowedSubset_oneLevel = -1;
 static int hf_x509if_AllowedSubset_wholeSubtree = -1;
 
 /*--- End of included file: packet-x509if-hf.c ---*/
 static int hf_x509if_AllowedSubset_wholeSubtree = -1;
 
 /*--- End of included file: packet-x509if-hf.c ---*/

-#line 52 "packet-x509if-template.c"
+#line 53 "packet-x509if-template.c"

 
 /* Initialize the subtree pointers */
 
 
 /* Initialize the subtree pointers */
 


@@ -280,7 +281,7 @@ static gint ett_x509if_Mapping = -1;
 static gint ett_x509if_MRSubstitution = -1;
 
 /*--- End of included file: packet-x509if-ett.c ---*/
 static gint ett_x509if_MRSubstitution = -1;
 
 /*--- End of included file: packet-x509if-ett.c ---*/

-#line 55 "packet-x509if-template.c"
+#line 56 "packet-x509if-template.c"

 
 static const char *object_identifier_id;
 static proto_tree *top_of_dn = NULL;
 
 static const char *object_identifier_id;
 static proto_tree *top_of_dn = NULL;


@@ -2242,7 +2243,7 @@ static void dissect_DistinguishedName_PDU(tvbuff_t *tvb, packet_info *pinfo, pro
 
 
 /*--- End of included file: packet-x509if-fn.c ---*/
 
 
 /*--- End of included file: packet-x509if-fn.c ---*/

-#line 77 "packet-x509if-template.c"
+#line 78 "packet-x509if-template.c"

 
 const char * x509if_get_last_dn(void)
 {
 
 const char * x509if_get_last_dn(void)
 {


@@ -2856,7 +2857,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-x509if-hfarr.c ---*/
         "", HFILL }},
 
 /*--- End of included file: packet-x509if-hfarr.c ---*/

-#line 122 "packet-x509if-template.c"
+#line 123 "packet-x509if-template.c"

   };
 
   /* List of subtrees */
   };
 
   /* List of subtrees */


@@ -2935,7 +2936,7 @@ void proto_register_x509if(void) {
     &ett_x509if_MRSubstitution,
 
 /*--- End of included file: packet-x509if-ettarr.c ---*/
     &ett_x509if_MRSubstitution,
 
 /*--- End of included file: packet-x509if-ettarr.c ---*/

-#line 127 "packet-x509if-template.c"
+#line 128 "packet-x509if-template.c"

   };
 
   /* Register protocol */
   };
 
   /* Register protocol */


@@ -2988,6 +2989,6 @@ void proto_reg_handoff_x509if(void) {
 
 
 /*--- End of included file: packet-x509if-dis-tab.c ---*/
 
 
 /*--- End of included file: packet-x509if-dis-tab.c ---*/

-#line 146 "packet-x509if-template.c"
+#line 147 "packet-x509if-template.c"

 }
 
 }