Re-generate a number of ASN.1-based dissectors with the most recent

version of asn2eth.

svn path=/trunk/; revision=12267

19 files changed, 286 insertions, 411 deletions

diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index e97be14376..8fae04193d 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -1,10 +1,9 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-h235.c                                                              */
+/* ./packet-h235.c                                                            */
 /* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
 
 /* Input file: packet-h235-template.c */
-/* Include files: packet-h235-hf.c, packet-h235-ett.c, packet-h235-fn.c, packet-h235-hfarr.c, packet-h235-ettarr.c, packet-h235-val.h */
 
 /* packet-h235.c
  * Routines for H.235 packet dissection
@@ -54,11 +53,6 @@ int proto_h235 = -1;
 
 /*--- Included file: packet-h235-hf.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-h235-hf.c                                                           */
-/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
-
 static int hf_h235_nonStandardIdentifier = -1;    /* OBJECT_IDENTIFIER */
 static int hf_h235_data = -1;                     /* OCTET_STRING */
 static int hf_h235_halfkey = -1;                  /* BIT_STRING_SIZE_0_2048 */
@@ -133,11 +127,6 @@ static int hf_h235_keyDerivationOID = -1;         /* OBJECT_IDENTIFIER */
 
 /*--- Included file: packet-h235-ett.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-h235-ett.c                                                          */
-/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
-
 static gint ett_h235_NonStandardParameter = -1;
 static gint ett_h235_DHset = -1;
 static gint ett_h235_ECpoint = -1;
@@ -171,15 +160,13 @@ PER_NOT_DECODED_YET("ToBeSigned");
 
 /*--- Included file: packet-h235-fn.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-h235-fn.c                                                           */
-/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
+/*--- Fields for imported types ---*/
 
 static int dissect_toBeSigned(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
   return dissect_xxx_ToBeSigned(tvb, offset, pinfo, tree, hf_h235_toBeSigned);
 }
 
+
 static int
 dissect_h235_ChallengeString(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
@@ -315,7 +302,7 @@ static int dissect_clearSaltingKey(tvbuff_t *tvb, int offset, packet_info *pinfo
   return dissect_h235_OCTET_STRING(tvb, offset, pinfo, tree, hf_h235_clearSaltingKey);
 }
 
-static per_sequence_t NonStandardParameter_sequence[] = {
+static const per_sequence_t NonStandardParameter_sequence[] = {
   { "nonStandardIdentifier"       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nonStandardIdentifier },
   { "data"                        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_data },
   { NULL, 0, 0, NULL }
@@ -350,7 +337,7 @@ static int dissect_generator(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
   return dissect_h235_BIT_STRING_SIZE_0_2048(tvb, offset, pinfo, tree, hf_h235_generator);
 }
 
-static per_sequence_t DHset_sequence[] = {
+static const per_sequence_t DHset_sequence[] = {
   { "halfkey"                     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_halfkey },
   { "modSize"                     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_modSize },
   { "generator"                   , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_generator },
@@ -395,7 +382,7 @@ static int dissect_fieldSize(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
   return dissect_h235_BIT_STRING_SIZE_0_511(tvb, offset, pinfo, tree, hf_h235_fieldSize);
 }
 
-static per_sequence_t ECpoint_sequence[] = {
+static const per_sequence_t ECpoint_sequence[] = {
   { "x"                           , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_x },
   { "y"                           , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_y },
   { NULL, 0, 0, NULL }
@@ -415,7 +402,7 @@ static int dissect_base(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
   return dissect_h235_ECpoint(tvb, offset, pinfo, tree, hf_h235_base);
 }
 
-static per_sequence_t T_eckasdhp_sequence[] = {
+static const per_sequence_t T_eckasdhp_sequence[] = {
   { "public-key"                  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_public_key },
   { "modulus"                     , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_modulus },
   { "base"                        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_base },
@@ -435,7 +422,7 @@ static int dissect_eckasdhp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
   return dissect_h235_T_eckasdhp(tvb, offset, pinfo, tree, hf_h235_eckasdhp);
 }
 
-static per_sequence_t T_eckasdh2_sequence[] = {
+static const per_sequence_t T_eckasdh2_sequence[] = {
   { "public-key"                  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_public_key },
   { "fieldSize"                   , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_fieldSize },
   { "base"                        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_base },
@@ -462,7 +449,7 @@ static const value_string ECKASDH_vals[] = {
   { 0, NULL }
 };
 
-static per_choice_t ECKASDH_choice[] = {
+static const per_choice_t ECKASDH_choice[] = {
   {   0, "eckasdhp"                    , ASN1_EXTENSION_ROOT    , dissect_eckasdhp },
   {   1, "eckasdh2"                    , ASN1_EXTENSION_ROOT    , dissect_eckasdh2 },
   { 0, NULL, 0, NULL }
@@ -480,7 +467,7 @@ static int dissect_eckasdhkey(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
   return dissect_h235_ECKASDH(tvb, offset, pinfo, tree, hf_h235_eckasdhkey);
 }
 
-static per_sequence_t TypedCertificate_sequence[] = {
+static const per_sequence_t TypedCertificate_sequence[] = {
   { "type"                        , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_type },
   { "certificate"                 , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_certificatedata },
   { NULL, 0, 0, NULL }
@@ -539,7 +526,7 @@ static const value_string AuthenticationBES_vals[] = {
   { 0, NULL }
 };
 
-static per_choice_t AuthenticationBES_choice[] = {
+static const per_choice_t AuthenticationBES_choice[] = {
   {   0, "default"                     , ASN1_EXTENSION_ROOT    , dissect_default },
   {   1, "radius"                      , ASN1_EXTENSION_ROOT    , dissect_radius },
   { 0, NULL, 0, NULL }
@@ -570,7 +557,7 @@ const value_string AuthenticationMechanism_vals[] = {
   { 0, NULL }
 };
 
-static per_choice_t AuthenticationMechanism_choice[] = {
+static const per_choice_t AuthenticationMechanism_choice[] = {
   {   0, "dhExch"                      , ASN1_EXTENSION_ROOT    , dissect_dhExch },
   {   1, "pwdSymEnc"                   , ASN1_EXTENSION_ROOT    , dissect_pwdSymEnc },
   {   2, "pwdHash"                     , ASN1_EXTENSION_ROOT    , dissect_pwdHash },
@@ -630,7 +617,7 @@ static int dissect_iv16(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
   return dissect_h235_IV16(tvb, offset, pinfo, tree, hf_h235_iv16);
 }
 
-static per_sequence_t Params_sequence[] = {
+static const per_sequence_t Params_sequence[] = {
   { "ranInt"                      , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_ranInt },
   { "iv8"                         , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_iv8 },
   { "iv16"                        , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL    , dissect_iv16 },
@@ -653,7 +640,7 @@ static int dissect_paramSsalt(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
   return dissect_h235_Params(tvb, offset, pinfo, tree, hf_h235_paramSsalt);
 }
 
-static per_sequence_t ENCRYPTEDxxx_sequence[] = {
+static const per_sequence_t ENCRYPTEDxxx_sequence[] = {
   { "algorithmOID"                , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_algorithmOID },
   { "paramS"                      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_paramS },
   { "encryptedData"               , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_encryptedData },
@@ -693,7 +680,7 @@ static int dissect_hash(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
   return dissect_h235_BIT_STRING(tvb, offset, pinfo, tree, hf_h235_hash);
 }
 
-static per_sequence_t SIGNEDxxx_sequence[] = {
+static const per_sequence_t SIGNEDxxx_sequence[] = {
   { "toBeSigned"                  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_toBeSigned },
   { "algorithmOID"                , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_algorithmOID },
   { "paramS"                      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_paramS },
@@ -716,7 +703,7 @@ static int dissect_certProtectedKey(tvbuff_t *tvb, int offset, packet_info *pinf
   return dissect_h235_SIGNEDxxx(tvb, offset, pinfo, tree, hf_h235_certProtectedKey);
 }
 
-static per_sequence_t V3KeySyncMaterial_sequence[] = {
+static const per_sequence_t V3KeySyncMaterial_sequence[] = {
   { "generalID"                   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_generalID },
   { "algorithmOID"                , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_algorithmOID },
   { "paramS"                      , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_paramS },
@@ -748,7 +735,7 @@ static const value_string H235Key_vals[] = {
   { 0, NULL }
 };
 
-static per_choice_t H235Key_choice[] = {
+static const per_choice_t H235Key_choice[] = {
   {   0, "secureChannel"               , ASN1_EXTENSION_ROOT    , dissect_secureChannel },
   {   1, "sharedSecret"                , ASN1_EXTENSION_ROOT    , dissect_sharedSecret },
   {   2, "certProtectedKey"            , ASN1_EXTENSION_ROOT    , dissect_certProtectedKey },
@@ -768,7 +755,7 @@ static int dissect_h235Key(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
   return dissect_h235_H235Key(tvb, offset, pinfo, tree, hf_h235_h235Key);
 }
 
-static per_sequence_t ClearToken_sequence[] = {
+static const per_sequence_t ClearToken_sequence[] = {
   { "tokenOID"                    , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_tokenOID },
   { "timeStamp"                   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_timeStamp },
   { "password"                    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_password },
@@ -796,7 +783,7 @@ static int dissect_hashedVals(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
   return dissect_h235_ClearToken(tvb, offset, pinfo, tree, hf_h235_hashedVals);
 }
 
-static per_sequence_t HASHEDxxx_sequence[] = {
+static const per_sequence_t HASHEDxxx_sequence[] = {
   { "algorithmOID"                , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_algorithmOID },
   { "paramS"                      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_paramS },
   { "hash"                        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_hash },
@@ -815,7 +802,7 @@ static int dissect_hashedToken(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
   return dissect_h235_HASHEDxxx(tvb, offset, pinfo, tree, hf_h235_hashedToken);
 }
 
-static per_sequence_t T_cryptoEncryptedToken_sequence[] = {
+static const per_sequence_t T_cryptoEncryptedToken_sequence[] = {
   { "tokenOID"                    , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_tokenOID },
   { "token"                       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_encryptedToken },
   { NULL, 0, 0, NULL }
@@ -832,7 +819,7 @@ static int dissect_cryptoEncryptedToken(tvbuff_t *tvb, int offset, packet_info *
   return dissect_h235_T_cryptoEncryptedToken(tvb, offset, pinfo, tree, hf_h235_cryptoEncryptedToken);
 }
 
-static per_sequence_t T_cryptoSignedToken_sequence[] = {
+static const per_sequence_t T_cryptoSignedToken_sequence[] = {
   { "tokenOID"                    , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_tokenOID },
   { "token"                       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_signedToken },
   { NULL, 0, 0, NULL }
@@ -849,7 +836,7 @@ static int dissect_cryptoSignedToken(tvbuff_t *tvb, int offset, packet_info *pin
   return dissect_h235_T_cryptoSignedToken(tvb, offset, pinfo, tree, hf_h235_cryptoSignedToken);
 }
 
-static per_sequence_t T_cryptoHashedToken_sequence[] = {
+static const per_sequence_t T_cryptoHashedToken_sequence[] = {
   { "tokenOID"                    , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_tokenOID },
   { "hashedVals"                  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_hashedVals },
   { "token"                       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_hashedToken },
@@ -876,7 +863,7 @@ const value_string CryptoToken_vals[] = {
   { 0, NULL }
 };
 
-static per_choice_t CryptoToken_choice[] = {
+static const per_choice_t CryptoToken_choice[] = {
   {   0, "cryptoEncryptedToken"        , ASN1_EXTENSION_ROOT    , dissect_cryptoEncryptedToken },
   {   1, "cryptoSignedToken"           , ASN1_EXTENSION_ROOT    , dissect_cryptoSignedToken },
   {   2, "cryptoHashedToken"           , ASN1_EXTENSION_ROOT    , dissect_cryptoHashedToken },
@@ -907,11 +894,6 @@ void proto_register_h235(void) {
 
 /*--- Included file: packet-h235-hfarr.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-h235-hfarr.c                                                        */
-/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
-
     { &hf_h235_nonStandardIdentifier,
       { "nonStandardIdentifier", "h235.nonStandardIdentifier",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -1186,11 +1168,6 @@ void proto_register_h235(void) {
 
 /*--- Included file: packet-h235-ettarr.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-h235-ettarr.c                                                       */
-/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
-
     &ett_h235_NonStandardParameter,
     &ett_h235_DHset,
     &ett_h235_ECpoint,
diff --git a/epan/dissectors/packet-h235.h b/epan/dissectors/packet-h235.h
index e5663d4d5d..83893ca605 100644
--- a/epan/dissectors/packet-h235.h
+++ b/epan/dissectors/packet-h235.h
@@ -1,10 +1,9 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-h235.h                                                              */
+/* ./packet-h235.h                                                            */
 /* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
 
 /* Input file: packet-h235-template.h */
-/* Include files: packet-h235-exp.h, packet-h235-valexp.h */
 
 /* packet-h235.h
  * Routines for H.235 packet dissection
@@ -37,11 +36,6 @@
 
 /*--- Included file: packet-h235-exp.h ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-h235-exp.h                                                          */
-/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
-
 extern const value_string AuthenticationMechanism_vals[];
 extern const value_string CryptoToken_vals[];
 int dissect_h235_TimeStamp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 05b20e6744..76d3cc74d5 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h248.c                                                            */
+/* ./packet-h248.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */
 
 /* Input file: packet-h248-template.c */
@@ -836,7 +836,7 @@ static int dissect_ad_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_h248_AuthData(TRUE, tvb, offset, pinfo, tree, hf_h248_ad);
 }
 
-static ber_sequence AuthenticationHeader_sequence[] = {
+static const ber_sequence AuthenticationHeader_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_secParmIndex_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_seqNum_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ad_impl },
@@ -920,7 +920,7 @@ static int dissect_manufacturerCode_impl(packet_info *pinfo, proto_tree *tree, t
   return dissect_h248_INTEGER_0_65535(TRUE, tvb, offset, pinfo, tree, hf_h248_manufacturerCode);
 }
 
-static ber_sequence IP4Address_sequence[] = {
+static const ber_sequence IP4Address_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_address_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl },
   { 0, 0, 0, NULL }
@@ -949,7 +949,7 @@ static int dissect_address1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_OCTET_STRING_SIZE_16(TRUE, tvb, offset, pinfo, tree, hf_h248_address1);
 }
 
-static ber_sequence IP6Address_sequence[] = {
+static const ber_sequence IP6Address_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_address1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl },
   { 0, 0, 0, NULL }
@@ -982,7 +982,7 @@ static int dissect_digitMapBody_impl(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_h248_IA5String(TRUE, tvb, offset, pinfo, tree, hf_h248_digitMapBody);
 }
 
-static ber_sequence DomainName_sequence[] = {
+static const ber_sequence DomainName_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_name_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl },
   { 0, 0, 0, NULL }
@@ -1026,7 +1026,7 @@ static const value_string MId_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice MId_choice[] = {
+static const ber_choice MId_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ip4Address_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ip6Address_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_domainName_impl },
@@ -1074,7 +1074,7 @@ static int dissect_errorText_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_ErrorText(TRUE, tvb, offset, pinfo, tree, hf_h248_errorText);
 }
 
-static ber_sequence ErrorDescriptor_sequence[] = {
+static const ber_sequence ErrorDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_errorCode_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorText_impl },
   { 0, 0, 0, NULL }
@@ -1180,7 +1180,7 @@ static int dissect_wildcard_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_WildcardField(FALSE, tvb, offset, pinfo, tree, hf_h248_wildcard_item);
 }
 
-static ber_sequence SEQUNCE_OF_WildcardField_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_WildcardField_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_wildcard_item },
 };
 
@@ -1207,7 +1207,7 @@ static int dissect_id1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_h248_OCTET_STRING_SIZE_1_8(TRUE, tvb, offset, pinfo, tree, hf_h248_id1);
 }
 
-static ber_sequence TerminationID_sequence[] = {
+static const ber_sequence TerminationID_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_wildcard_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_id1_impl },
   { 0, 0, 0, NULL }
@@ -1267,7 +1267,7 @@ static int dissect_streamID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_StreamID(TRUE, tvb, offset, pinfo, tree, hf_h248_streamID);
 }
 
-static ber_sequence TopologyRequest_sequence[] = {
+static const ber_sequence TopologyRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationFrom_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationTo_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_topologyDirection_impl },
@@ -1286,7 +1286,7 @@ static int dissect_topologyReq_item(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_TopologyRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_topologyReq_item);
 }
 
-static ber_sequence SEQUNCE_OF_TopologyRequest_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_TopologyRequest_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_topologyReq_item },
 };
 
@@ -1301,7 +1301,7 @@ static int dissect_topologyReq_impl(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_SEQUNCE_OF_TopologyRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_topologyReq);
 }
 
-static ber_sequence ContextRequest_sequence[] = {
+static const ber_sequence ContextRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_emergency_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_topologyReq_impl },
@@ -1366,7 +1366,7 @@ static int dissect_serviceState_impl(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_serviceState);
 }
 
-static ber_sequence ContextAttrAuditRequest_sequence[] = {
+static const ber_sequence ContextAttrAuditRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_topology_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_emergency1_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority1_impl },
@@ -1384,7 +1384,7 @@ static int dissect_contextAttrAuditReq_impl(packet_info *pinfo, proto_tree *tree
   return dissect_h248_ContextAttrAuditRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_contextAttrAuditReq);
 }
 
-static ber_sequence TerminationIDList_sequence_of[1] = {
+static const ber_sequence TerminationIDList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TerminationIDList_item },
 };
 
@@ -1425,7 +1425,7 @@ static int dissect_value_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
   return dissect_h248_PropertyID(FALSE, tvb, offset, pinfo, tree, hf_h248_value_item);
 }
 
-static ber_sequence SEQUNCE_OF_PropertyID_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_PropertyID_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_value_item },
 };
 
@@ -1467,7 +1467,7 @@ static const value_string T_extraInfo1_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice T_extraInfo1_choice[] = {
+static const ber_choice T_extraInfo1_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relation_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_range_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sublist_impl },
@@ -1485,7 +1485,7 @@ static int dissect_extraInfo1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
   return dissect_h248_T_extraInfo1(FALSE, tvb, offset, pinfo, tree, hf_h248_extraInfo1);
 }
 
-static ber_sequence PropertyParm_sequence[] = {
+static const ber_sequence PropertyParm_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value1_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_extraInfo1 },
@@ -1509,7 +1509,7 @@ static int dissect_mpl_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_h248_PropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_mpl_item);
 }
 
-static ber_sequence SEQUNCE_OF_PropertyParm_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_PropertyParm_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_propertyParms_item1 },
 };
 
@@ -1564,7 +1564,7 @@ static int dissect_serviceState1_impl(packet_info *pinfo, proto_tree *tree, tvbu
   return dissect_h248_ServiceState(TRUE, tvb, offset, pinfo, tree, hf_h248_serviceState1);
 }
 
-static ber_sequence TerminationStateDescriptor_sequence[] = {
+static const ber_sequence TerminationStateDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyParms1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventBufferControl1_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceState1_impl },
@@ -1603,7 +1603,7 @@ static int dissect_streamMode1_impl(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_StreamMode(TRUE, tvb, offset, pinfo, tree, hf_h248_streamMode1);
 }
 
-static ber_sequence LocalControlDescriptor_sequence[] = {
+static const ber_sequence LocalControlDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamMode1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveValue1_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveGroup1_impl },
@@ -1622,7 +1622,7 @@ static int dissect_localControlDescriptor1_impl(packet_info *pinfo, proto_tree *
   return dissect_h248_LocalControlDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_localControlDescriptor1);
 }
 
-static ber_sequence PropertyGroup_sequence_of[1] = {
+static const ber_sequence PropertyGroup_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PropertyGroup_item },
 };
 
@@ -1637,7 +1637,7 @@ static int dissect_propGrps_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_PropertyGroup(FALSE, tvb, offset, pinfo, tree, hf_h248_propGrps_item);
 }
 
-static ber_sequence SEQUNCE_OF_PropertyGroup_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_PropertyGroup_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_propGrps_item },
 };
 
@@ -1652,7 +1652,7 @@ static int dissect_propGrps1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_SEQUNCE_OF_PropertyGroup(TRUE, tvb, offset, pinfo, tree, hf_h248_propGrps1);
 }
 
-static ber_sequence LocalRemoteDescriptor_sequence[] = {
+static const ber_sequence LocalRemoteDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propGrps1_impl },
   { 0, 0, 0, NULL }
 };
@@ -1671,7 +1671,7 @@ static int dissect_remoteDescriptor1_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_LocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_remoteDescriptor1);
 }
 
-static ber_sequence StreamParms_sequence[] = {
+static const ber_sequence StreamParms_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localControlDescriptor1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDescriptor1_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_remoteDescriptor1_impl },
@@ -1692,7 +1692,7 @@ static int dissect_streamParms1_impl(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_h248_StreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_streamParms1);
 }
 
-static ber_sequence StreamDescriptor_sequence[] = {
+static const ber_sequence StreamDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_streamParms1_impl },
   { 0, 0, 0, NULL }
@@ -1709,7 +1709,7 @@ static int dissect_multiStream_item1(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_h248_StreamDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_multiStream_item1);
 }
 
-static ber_sequence SEQUNCE_OF_StreamDescriptor_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_StreamDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_multiStream_item1 },
 };
 
@@ -1731,7 +1731,7 @@ static const value_string T_streams1_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice T_streams1_choice[] = {
+static const ber_choice T_streams1_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_oneStream1_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_multiStream1_impl },
   { 0, 0, 0, 0, NULL }
@@ -1748,7 +1748,7 @@ static int dissect_streams1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_h248_T_streams1(FALSE, tvb, offset, pinfo, tree, hf_h248_streams1);
 }
 
-static ber_sequence MediaDescriptor_sequence[] = {
+static const ber_sequence MediaDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_termStateDescr1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_streams1 },
   { 0, 0, 0, NULL }
@@ -1790,7 +1790,7 @@ static int dissect_mtl_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_h248_ModemType(FALSE, tvb, offset, pinfo, tree, hf_h248_mtl_item);
 }
 
-static ber_sequence SEQUNCE_OF_ModemType_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_ModemType_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_mtl_item },
 };
 
@@ -1835,7 +1835,7 @@ static int dissect_t35Extension_impl(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_h248_INTEGER_0_255(TRUE, tvb, offset, pinfo, tree, hf_h248_t35Extension);
 }
 
-static ber_sequence H221NonStandard_sequence[] = {
+static const ber_sequence H221NonStandard_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_t35CountryCode1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_t35CountryCode2_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_t35Extension_impl },
@@ -1881,7 +1881,7 @@ static const value_string NonStandardIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice NonStandardIdentifier_choice[] = {
+static const ber_choice NonStandardIdentifier_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_object_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h221NonStandard_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_experimental_impl },
@@ -1914,7 +1914,7 @@ static int dissect_Value_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
   return dissect_h248_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_h248_Value_item);
 }
 
-static ber_sequence NonStandardData_sequence[] = {
+static const ber_sequence NonStandardData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_nonStandardIdentifier },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_data_impl },
   { 0, 0, 0, NULL }
@@ -1931,7 +1931,7 @@ static int dissect_nonStandardData_impl(packet_info *pinfo, proto_tree *tree, tv
   return dissect_h248_NonStandardData(TRUE, tvb, offset, pinfo, tree, hf_h248_nonStandardData);
 }
 
-static ber_sequence ModemDescriptor_sequence[] = {
+static const ber_sequence ModemDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mtl_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mpl_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nonStandardData_impl },
@@ -1970,7 +1970,7 @@ static int dissect_muxType_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
   return dissect_h248_MuxType(TRUE, tvb, offset, pinfo, tree, hf_h248_muxType);
 }
 
-static ber_sequence SEQUNCE_OF_TerminationID_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_TerminationID_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_termList_item },
 };
 
@@ -1985,7 +1985,7 @@ static int dissect_termList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_SEQUNCE_OF_TerminationID(TRUE, tvb, offset, pinfo, tree, hf_h248_termList);
 }
 
-static ber_sequence MuxDescriptor_sequence[] = {
+static const ber_sequence MuxDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_muxType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_termList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nonStandardData_impl },
@@ -2047,7 +2047,7 @@ static int dissect_digitMapName_impl(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_h248_DigitMapName(TRUE, tvb, offset, pinfo, tree, hf_h248_digitMapName);
 }
 
-static ber_sequence DigitMapValue_sequence[] = {
+static const ber_sequence DigitMapValue_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startTimer_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_shortTimer_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_longTimer_impl },
@@ -2074,7 +2074,7 @@ static const value_string EventDM_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice EventDM_choice[] = {
+static const ber_choice EventDM_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_digitMapName_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_digitMapValue_impl },
   { 0, 0, 0, 0, NULL }
@@ -2121,7 +2121,7 @@ static int dissect_sigType_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
   return dissect_h248_SignalType(TRUE, tvb, offset, pinfo, tree, hf_h248_sigType);
 }
 
-static asn_namedbit NotifyCompletion_bits[] = {
+static const asn_namedbit NotifyCompletion_bits[] = {
   {  0, &hf_h248_NotifyCompletion_onTimeOut, -1, -1, NULL, NULL },
   {  1, &hf_h248_NotifyCompletion_onInterruptByEvent, -1, -1, NULL, NULL },
   {  2, &hf_h248_NotifyCompletion_onInterruptByNewSignalDescr, -1, -1, NULL, NULL },
@@ -2141,7 +2141,7 @@ static int dissect_notifyCompletion_impl(packet_info *pinfo, proto_tree *tree, t
   return dissect_h248_NotifyCompletion(TRUE, tvb, offset, pinfo, tree, hf_h248_notifyCompletion);
 }
 
-static ber_sequence Value_sequence_of[1] = {
+static const ber_sequence Value_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_Value_item },
 };
 
@@ -2170,7 +2170,7 @@ static const value_string T_extraInfo2_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice T_extraInfo2_choice[] = {
+static const ber_choice T_extraInfo2_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relation_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_range_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sublist_impl },
@@ -2188,7 +2188,7 @@ static int dissect_extraInfo2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
   return dissect_h248_T_extraInfo2(FALSE, tvb, offset, pinfo, tree, hf_h248_extraInfo2);
 }
 
-static ber_sequence SigParameter_sequence[] = {
+static const ber_sequence SigParameter_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sigParameterName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_extraInfo2 },
@@ -2206,7 +2206,7 @@ static int dissect_sigParList_item(packet_info *pinfo, proto_tree *tree, tvbuff_
   return dissect_h248_SigParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_sigParList_item);
 }
 
-static ber_sequence SEQUNCE_OF_SigParameter_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_SigParameter_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_sigParList_item },
 };
 
@@ -2221,7 +2221,7 @@ static int dissect_sigParList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
   return dissect_h248_SEQUNCE_OF_SigParameter(TRUE, tvb, offset, pinfo, tree, hf_h248_sigParList);
 }
 
-static ber_sequence Signal_sequence[] = {
+static const ber_sequence Signal_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signalName1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sigType_impl },
@@ -2246,7 +2246,7 @@ static int dissect_signalList_item(packet_info *pinfo, proto_tree *tree, tvbuff_
   return dissect_h248_Signal(FALSE, tvb, offset, pinfo, tree, hf_h248_signalList_item);
 }
 
-static ber_sequence SEQUNCE_OF_Signal_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_Signal_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signalList_item },
 };
 
@@ -2261,7 +2261,7 @@ static int dissect_signalList1_impl(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_SEQUNCE_OF_Signal(TRUE, tvb, offset, pinfo, tree, hf_h248_signalList1);
 }
 
-static ber_sequence SeqSigList_sequence[] = {
+static const ber_sequence SeqSigList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_id_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_signalList1_impl },
   { 0, 0, 0, NULL }
@@ -2285,7 +2285,7 @@ static const value_string SignalRequest_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice SignalRequest_choice[] = {
+static const ber_choice SignalRequest_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signal1_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_seqSigList1_impl },
   { 0, 0, 0, 0, NULL }
@@ -2302,7 +2302,7 @@ static int dissect_SignalsDescriptor_item(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_SignalRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_SignalsDescriptor_item);
 }
 
-static ber_sequence SignalsDescriptor_sequence_of[1] = {
+static const ber_sequence SignalsDescriptor_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SignalsDescriptor_item },
 };
 
@@ -2317,7 +2317,7 @@ static int dissect_signalsDescriptor_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_SignalsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_signalsDescriptor);
 }
 
-static ber_sequence SecondRequestedActions_sequence[] = {
+static const ber_sequence SecondRequestedActions_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keepActive_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_eventDM },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signalsDescriptor_impl },
@@ -2343,7 +2343,7 @@ static const value_string T_extraInfo_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice T_extraInfo_choice[] = {
+static const ber_choice T_extraInfo_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relation_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_range_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sublist_impl },
@@ -2361,7 +2361,7 @@ static int dissect_extraInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
   return dissect_h248_T_extraInfo(FALSE, tvb, offset, pinfo, tree, hf_h248_extraInfo);
 }
 
-static ber_sequence EventParameter_sequence[] = {
+static const ber_sequence EventParameter_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventParameterName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl },
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_extraInfo },
@@ -2382,7 +2382,7 @@ static int dissect_evParList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_EventParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_evParList_item);
 }
 
-static ber_sequence SEQUNCE_OF_EventParameter_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_EventParameter_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_eventParList_item },
 };
 
@@ -2400,7 +2400,7 @@ static int dissect_evParList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_SEQUNCE_OF_EventParameter(TRUE, tvb, offset, pinfo, tree, hf_h248_evParList);
 }
 
-static ber_sequence SecondRequestedEvent_sequence[] = {
+static const ber_sequence SecondRequestedEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventAction1_impl },
@@ -2419,7 +2419,7 @@ static int dissect_eventList_item1(packet_info *pinfo, proto_tree *tree, tvbuff_
   return dissect_h248_SecondRequestedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_eventList_item1);
 }
 
-static ber_sequence SEQUNCE_OF_SecondRequestedEvent_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_SecondRequestedEvent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_eventList_item1 },
 };
 
@@ -2434,7 +2434,7 @@ static int dissect_eventList1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
   return dissect_h248_SEQUNCE_OF_SecondRequestedEvent(TRUE, tvb, offset, pinfo, tree, hf_h248_eventList1);
 }
 
-static ber_sequence SecondEventsDescriptor_sequence[] = {
+static const ber_sequence SecondEventsDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventList1_impl },
   { 0, 0, 0, NULL }
@@ -2451,7 +2451,7 @@ static int dissect_secondEvent_impl(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_SecondEventsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_secondEvent);
 }
 
-static ber_sequence RequestedActions_sequence[] = {
+static const ber_sequence RequestedActions_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keepActive_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_eventDM },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_secondEvent_impl },
@@ -2470,7 +2470,7 @@ static int dissect_eventAction_impl(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_RequestedActions(TRUE, tvb, offset, pinfo, tree, hf_h248_eventAction);
 }
 
-static ber_sequence RequestedEvent_sequence[] = {
+static const ber_sequence RequestedEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventAction_impl },
@@ -2489,7 +2489,7 @@ static int dissect_eventList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_RequestedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_eventList_item);
 }
 
-static ber_sequence SEQUNCE_OF_RequestedEvent_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_RequestedEvent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_eventList_item },
 };
 
@@ -2504,7 +2504,7 @@ static int dissect_eventList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_SEQUNCE_OF_RequestedEvent(TRUE, tvb, offset, pinfo, tree, hf_h248_eventList);
 }
 
-static ber_sequence EventsDescriptor_sequence[] = {
+static const ber_sequence EventsDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventList_impl },
   { 0, 0, 0, NULL }
@@ -2532,7 +2532,7 @@ static int dissect_eventName1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
   return dissect_h248_EventName(TRUE, tvb, offset, pinfo, tree, hf_h248_eventName1);
 }
 
-static ber_sequence EventSpec_sequence[] = {
+static const ber_sequence EventSpec_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventParList_impl },
@@ -2550,7 +2550,7 @@ static int dissect_EventBufferDescriptor_item(packet_info *pinfo, proto_tree *tr
   return dissect_h248_EventSpec(FALSE, tvb, offset, pinfo, tree, hf_h248_EventBufferDescriptor_item);
 }
 
-static ber_sequence EventBufferDescriptor_sequence_of[1] = {
+static const ber_sequence EventBufferDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_EventBufferDescriptor_item },
 };
 
@@ -2565,7 +2565,7 @@ static int dissect_eventBufferDescriptor_impl(packet_info *pinfo, proto_tree *tr
   return dissect_h248_EventBufferDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_eventBufferDescriptor);
 }
 
-static ber_sequence DigitMapDescriptor_sequence[] = {
+static const ber_sequence DigitMapDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digitMapName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digitMapValue_impl },
   { 0, 0, 0, NULL }
@@ -2582,7 +2582,7 @@ static int dissect_digitMapDescriptor_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_DigitMapDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_digitMapDescriptor);
 }
 
-static asn_namedbit T_auditToken_bits[] = {
+static const asn_namedbit T_auditToken_bits[] = {
   {  0, &hf_h248_T_auditToken_muxToken, -1, -1, NULL, NULL },
   {  1, &hf_h248_T_auditToken_modemToken, -1, -1, NULL, NULL },
   {  2, &hf_h248_T_auditToken_mediaToken, -1, -1, NULL, NULL },
@@ -2608,7 +2608,7 @@ static int dissect_auditToken_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
   return dissect_h248_T_auditToken(TRUE, tvb, offset, pinfo, tree, hf_h248_auditToken);
 }
 
-static ber_sequence IndAudPropertyParm_sequence[] = {
+static const ber_sequence IndAudPropertyParm_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_name1_impl },
   { 0, 0, 0, NULL }
 };
@@ -2627,7 +2627,7 @@ static int dissect_IndAudPropertyGroup_item(packet_info *pinfo, proto_tree *tree
   return dissect_h248_IndAudPropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_IndAudPropertyGroup_item);
 }
 
-static ber_sequence SEQUNCE_OF_IndAudPropertyParm_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_IndAudPropertyParm_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_propertyParms_item },
 };
 
@@ -2642,7 +2642,7 @@ static int dissect_propertyParms_impl(packet_info *pinfo, proto_tree *tree, tvbu
   return dissect_h248_SEQUNCE_OF_IndAudPropertyParm(TRUE, tvb, offset, pinfo, tree, hf_h248_propertyParms);
 }
 
-static ber_sequence IndAudTerminationStateDescriptor_sequence[] = {
+static const ber_sequence IndAudTerminationStateDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyParms_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventBufferControl_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceState_impl },
@@ -2660,7 +2660,7 @@ static int dissect_termStateDescr_impl(packet_info *pinfo, proto_tree *tree, tvb
   return dissect_h248_IndAudTerminationStateDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_termStateDescr);
 }
 
-static ber_sequence IndAudLocalControlDescriptor_sequence[] = {
+static const ber_sequence IndAudLocalControlDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamMode_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveValue_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveGroup_impl },
@@ -2679,7 +2679,7 @@ static int dissect_localControlDescriptor_impl(packet_info *pinfo, proto_tree *t
   return dissect_h248_IndAudLocalControlDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_localControlDescriptor);
 }
 
-static ber_sequence IndAudPropertyGroup_sequence_of[1] = {
+static const ber_sequence IndAudPropertyGroup_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IndAudPropertyGroup_item },
 };
 
@@ -2694,7 +2694,7 @@ static int dissect_propGrps_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_IndAudPropertyGroup(TRUE, tvb, offset, pinfo, tree, hf_h248_propGrps);
 }
 
-static ber_sequence IndAudLocalRemoteDescriptor_sequence[] = {
+static const ber_sequence IndAudLocalRemoteDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_propGroupID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_propGrps_impl },
   { 0, 0, 0, NULL }
@@ -2714,7 +2714,7 @@ static int dissect_remoteDescriptor_impl(packet_info *pinfo, proto_tree *tree, t
   return dissect_h248_IndAudLocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_remoteDescriptor);
 }
 
-static ber_sequence IndAudStreamParms_sequence[] = {
+static const ber_sequence IndAudStreamParms_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localControlDescriptor_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDescriptor_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_remoteDescriptor_impl },
@@ -2735,7 +2735,7 @@ static int dissect_streamParms_impl(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_IndAudStreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_streamParms);
 }
 
-static ber_sequence IndAudStreamDescriptor_sequence[] = {
+static const ber_sequence IndAudStreamDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_streamParms_impl },
   { 0, 0, 0, NULL }
@@ -2752,7 +2752,7 @@ static int dissect_multiStream_item(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_IndAudStreamDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_multiStream_item);
 }
 
-static ber_sequence SEQUNCE_OF_IndAudStreamDescriptor_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_IndAudStreamDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_multiStream_item },
 };
 
@@ -2774,7 +2774,7 @@ static const value_string T_streams_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice T_streams_choice[] = {
+static const ber_choice T_streams_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_oneStream_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_multiStream_impl },
   { 0, 0, 0, 0, NULL }
@@ -2791,7 +2791,7 @@ static int dissect_streams(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_h248_T_streams(FALSE, tvb, offset, pinfo, tree, hf_h248_streams);
 }
 
-static ber_sequence IndAudMediaDescriptor_sequence[] = {
+static const ber_sequence IndAudMediaDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_termStateDescr_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_streams },
   { 0, 0, 0, NULL }
@@ -2808,7 +2808,7 @@ static int dissect_indaudmediaDescriptor_impl(packet_info *pinfo, proto_tree *tr
   return dissect_h248_IndAudMediaDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indaudmediaDescriptor);
 }
 
-static ber_sequence IndAudEventsDescriptor_sequence[] = {
+static const ber_sequence IndAudEventsDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
@@ -2826,7 +2826,7 @@ static int dissect_indaudeventsDescriptor_impl(packet_info *pinfo, proto_tree *t
   return dissect_h248_IndAudEventsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indaudeventsDescriptor);
 }
 
-static ber_sequence IndAudEventBufferDescriptor_sequence[] = {
+static const ber_sequence IndAudEventBufferDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { 0, 0, 0, NULL }
@@ -2843,7 +2843,7 @@ static int dissect_indaudeventBufferDescriptor_impl(packet_info *pinfo, proto_tr
   return dissect_h248_IndAudEventBufferDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indaudeventBufferDescriptor);
 }
 
-static ber_sequence IndAudSignal_sequence[] = {
+static const ber_sequence IndAudSignal_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signalName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { 0, 0, 0, NULL }
@@ -2863,7 +2863,7 @@ static int dissect_signalList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
   return dissect_h248_IndAudSignal(TRUE, tvb, offset, pinfo, tree, hf_h248_signalList);
 }
 
-static ber_sequence IndAudSeqSigList_sequence[] = {
+static const ber_sequence IndAudSeqSigList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_id_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signalList_impl },
   { 0, 0, 0, NULL }
@@ -2887,7 +2887,7 @@ static const value_string IndAudSignalsDescriptor_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice IndAudSignalsDescriptor_choice[] = {
+static const ber_choice IndAudSignalsDescriptor_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signal_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_seqSigList_impl },
   { 0, 0, 0, 0, NULL }
@@ -2904,7 +2904,7 @@ static int dissect_indaudsignalsDescriptor(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_IndAudSignalsDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_indaudsignalsDescriptor);
 }
 
-static ber_sequence IndAudDigitMapDescriptor_sequence[] = {
+static const ber_sequence IndAudDigitMapDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digitMapName_impl },
   { 0, 0, 0, NULL }
 };
@@ -2920,7 +2920,7 @@ static int dissect_indauddigitMapDescriptor_impl(packet_info *pinfo, proto_tree
   return dissect_h248_IndAudDigitMapDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indauddigitMapDescriptor);
 }
 
-static ber_sequence IndAudStatisticsDescriptor_sequence[] = {
+static const ber_sequence IndAudStatisticsDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_statName_impl },
   { 0, 0, 0, NULL }
 };
@@ -2936,7 +2936,7 @@ static int dissect_indaudstatisticsDescriptor_impl(packet_info *pinfo, proto_tre
   return dissect_h248_IndAudStatisticsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indaudstatisticsDescriptor);
 }
 
-static ber_sequence IndAudPackagesDescriptor_sequence[] = {
+static const ber_sequence IndAudPackagesDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_packageName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_packageVersion_impl },
   { 0, 0, 0, NULL }
@@ -2965,7 +2965,7 @@ static const value_string IndAuditParameter_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice IndAuditParameter_choice[] = {
+static const ber_choice IndAuditParameter_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_indaudmediaDescriptor_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indaudeventsDescriptor_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_indaudeventBufferDescriptor_impl },
@@ -2987,7 +2987,7 @@ static int dissect_auditPropertyToken_item(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_IndAuditParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_auditPropertyToken_item);
 }
 
-static ber_sequence SEQUNCE_OF_IndAuditParameter_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_IndAuditParameter_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_auditPropertyToken_item },
 };
 
@@ -3002,7 +3002,7 @@ static int dissect_auditPropertyToken_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_SEQUNCE_OF_IndAuditParameter(TRUE, tvb, offset, pinfo, tree, hf_h248_auditPropertyToken);
 }
 
-static ber_sequence AuditDescriptor_sequence[] = {
+static const ber_sequence AuditDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auditToken_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auditPropertyToken_impl },
   { 0, 0, 0, NULL }
@@ -3038,7 +3038,7 @@ static const value_string AmmDescriptor_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice AmmDescriptor_choice[] = {
+static const ber_choice AmmDescriptor_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mediaDescriptor_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_modemDescriptor_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_muxDescriptor_impl },
@@ -3061,7 +3061,7 @@ static int dissect_descriptors_item(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_AmmDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_descriptors_item);
 }
 
-static ber_sequence SEQUNCE_OF_AmmDescriptor_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_AmmDescriptor_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_descriptors_item },
 };
 
@@ -3076,7 +3076,7 @@ static int dissect_descriptors_impl(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_SEQUNCE_OF_AmmDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_descriptors);
 }
 
-static ber_sequence AmmRequest_sequence[] = {
+static const ber_sequence AmmRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_descriptors_impl },
   { 0, 0, 0, NULL }
@@ -3099,7 +3099,7 @@ static int dissect_modReq_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
   return dissect_h248_AmmRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_modReq);
 }
 
-static ber_sequence SubtractRequest_sequence[] = {
+static const ber_sequence SubtractRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auditDescriptor_impl },
   { 0, 0, 0, NULL }
@@ -3116,7 +3116,7 @@ static int dissect_subtractReq_impl(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_SubtractRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_subtractReq);
 }
 
-static ber_sequence AuditRequest_sequence[] = {
+static const ber_sequence AuditRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_auditDescriptor_impl },
   { 0, 0, 0, NULL }
@@ -3136,7 +3136,7 @@ static int dissect_auditValueRequest_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_AuditRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_auditValueRequest);
 }
 
-static ber_sequence TimeNotation_sequence[] = {
+static const ber_sequence TimeNotation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_date_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_time_impl },
   { 0, 0, 0, NULL }
@@ -3159,7 +3159,7 @@ static int dissect_timestamp_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_h248_TimeNotation(TRUE, tvb, offset, pinfo, tree, hf_h248_timestamp);
 }
 
-static ber_sequence ObservedEvent_sequence[] = {
+static const ber_sequence ObservedEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventParList_impl },
@@ -3178,7 +3178,7 @@ static int dissect_observedEventLst_item(packet_info *pinfo, proto_tree *tree, t
   return dissect_h248_ObservedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_observedEventLst_item);
 }
 
-static ber_sequence SEQUNCE_OF_ObservedEvent_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_ObservedEvent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_observedEventLst_item },
 };
 
@@ -3193,7 +3193,7 @@ static int dissect_observedEventLst_impl(packet_info *pinfo, proto_tree *tree, t
   return dissect_h248_SEQUNCE_OF_ObservedEvent(TRUE, tvb, offset, pinfo, tree, hf_h248_observedEventLst);
 }
 
-static ber_sequence ObservedEventsDescriptor_sequence[] = {
+static const ber_sequence ObservedEventsDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_observedEventLst_impl },
   { 0, 0, 0, NULL }
@@ -3210,7 +3210,7 @@ static int dissect_observedEventsDescriptor_impl(packet_info *pinfo, proto_tree
   return dissect_h248_ObservedEventsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_observedEventsDescriptor);
 }
 
-static ber_sequence NotifyRequest_sequence[] = {
+static const ber_sequence NotifyRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_observedEventsDescriptor_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl },
@@ -3273,7 +3273,7 @@ static const value_string ServiceChangeAddress_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice ServiceChangeAddress_choice[] = {
+static const ber_choice ServiceChangeAddress_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_portNumber_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ip4Address_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ip6Address_impl },
@@ -3307,7 +3307,7 @@ static int dissect_profileName_impl(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_IA5String_SIZE_1_67(TRUE, tvb, offset, pinfo, tree, hf_h248_profileName);
 }
 
-static ber_sequence ServiceChangeProfile_sequence[] = {
+static const ber_sequence ServiceChangeProfile_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_profileName_impl },
   { 0, 0, 0, NULL }
 };
@@ -3335,7 +3335,7 @@ static int dissect_serviceChangeDelay_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_INTEGER_0_4294967295(TRUE, tvb, offset, pinfo, tree, hf_h248_serviceChangeDelay);
 }
 
-static ber_sequence ServiceChangeParm_sequence[] = {
+static const ber_sequence ServiceChangeParm_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceChangeMethod_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_serviceChangeAddress },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceChangeVersion_impl },
@@ -3360,7 +3360,7 @@ static int dissect_serviceChangeParms_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_ServiceChangeParm(TRUE, tvb, offset, pinfo, tree, hf_h248_serviceChangeParms);
 }
 
-static ber_sequence ServiceChangeRequest_sequence[] = {
+static const ber_sequence ServiceChangeRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceChangeParms_impl },
   { 0, 0, 0, NULL }
@@ -3390,7 +3390,7 @@ static const value_string Command_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice Command_choice[] = {
+static const ber_choice Command_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_addReq_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_moveReq_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_modReq_impl },
@@ -3413,7 +3413,7 @@ static int dissect_command(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_h248_Command(FALSE, tvb, offset, pinfo, tree, hf_h248_command);
 }
 
-static ber_sequence CommandRequest_sequence[] = {
+static const ber_sequence CommandRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_command },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_optional_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_wildcardReturn_impl },
@@ -3431,7 +3431,7 @@ static int dissect_commandRequests_item(packet_info *pinfo, proto_tree *tree, tv
   return dissect_h248_CommandRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_commandRequests_item);
 }
 
-static ber_sequence SEQUNCE_OF_CommandRequest_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_CommandRequest_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_commandRequests_item },
 };
 
@@ -3446,7 +3446,7 @@ static int dissect_commandRequests_impl(packet_info *pinfo, proto_tree *tree, tv
   return dissect_h248_SEQUNCE_OF_CommandRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_commandRequests);
 }
 
-static ber_sequence ActionRequest_sequence[] = {
+static const ber_sequence ActionRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contextId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_contextRequest_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_contextAttrAuditReq_impl },
@@ -3465,7 +3465,7 @@ static int dissect_actions_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *
   return dissect_h248_ActionRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_actions_item);
 }
 
-static ber_sequence SEQUNCE_OF_ActionRequest_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_ActionRequest_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actions_item },
 };
 
@@ -3480,7 +3480,7 @@ static int dissect_actions_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
   return dissect_h248_SEQUNCE_OF_ActionRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_actions);
 }
 
-static ber_sequence TransactionRequest_sequence[] = {
+static const ber_sequence TransactionRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actions_impl },
   { 0, 0, 0, NULL }
@@ -3497,7 +3497,7 @@ static int dissect_transactionRequest_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_TransactionRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_transactionRequest);
 }
 
-static ber_sequence TransactionPending_sequence[] = {
+static const ber_sequence TransactionPending_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionId_impl },
   { 0, 0, 0, NULL }
 };
@@ -3513,7 +3513,7 @@ static int dissect_transactionPending_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_TransactionPending(TRUE, tvb, offset, pinfo, tree, hf_h248_transactionPending);
 }
 
-static ber_sequence StatisticsParameter_sequence[] = {
+static const ber_sequence StatisticsParameter_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_statName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_statValue_impl },
   { 0, 0, 0, NULL }
@@ -3530,7 +3530,7 @@ static int dissect_StatisticsDescriptor_item(packet_info *pinfo, proto_tree *tre
   return dissect_h248_StatisticsParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_StatisticsDescriptor_item);
 }
 
-static ber_sequence StatisticsDescriptor_sequence_of[1] = {
+static const ber_sequence StatisticsDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_StatisticsDescriptor_item },
 };
 
@@ -3545,7 +3545,7 @@ static int dissect_statisticsDescriptor_impl(packet_info *pinfo, proto_tree *tre
   return dissect_h248_StatisticsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_statisticsDescriptor);
 }
 
-static ber_sequence PackagesItem_sequence[] = {
+static const ber_sequence PackagesItem_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_packageName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_packageVersion_impl },
   { 0, 0, 0, NULL }
@@ -3562,7 +3562,7 @@ static int dissect_PackagesDescriptor_item(packet_info *pinfo, proto_tree *tree,
   return dissect_h248_PackagesItem(FALSE, tvb, offset, pinfo, tree, hf_h248_PackagesDescriptor_item);
 }
 
-static ber_sequence PackagesDescriptor_sequence_of[1] = {
+static const ber_sequence PackagesDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PackagesDescriptor_item },
 };
 
@@ -3594,7 +3594,7 @@ static const value_string AuditReturnParameter_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice AuditReturnParameter_choice[] = {
+static const ber_choice AuditReturnParameter_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mediaDescriptor_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_modemDescriptor_impl },
@@ -3621,7 +3621,7 @@ static int dissect_TerminationAudit_item(packet_info *pinfo, proto_tree *tree, t
   return dissect_h248_AuditReturnParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_TerminationAudit_item);
 }
 
-static ber_sequence TerminationAudit_sequence_of[1] = {
+static const ber_sequence TerminationAudit_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_TerminationAudit_item },
 };
 
@@ -3639,7 +3639,7 @@ static int dissect_terminationAuditResult_impl(packet_info *pinfo, proto_tree *t
   return dissect_h248_TerminationAudit(TRUE, tvb, offset, pinfo, tree, hf_h248_terminationAuditResult);
 }
 
-static ber_sequence AmmsReply_sequence[] = {
+static const ber_sequence AmmsReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_terminationAudit_impl },
   { 0, 0, 0, NULL }
@@ -3665,7 +3665,7 @@ static int dissect_subtractReply_impl(packet_info *pinfo, proto_tree *tree, tvbu
   return dissect_h248_AmmsReply(TRUE, tvb, offset, pinfo, tree, hf_h248_subtractReply);
 }
 
-static ber_sequence AuditResult_sequence[] = {
+static const ber_sequence AuditResult_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationAuditResult_impl },
   { 0, 0, 0, NULL }
@@ -3690,7 +3690,7 @@ static const value_string AuditReply_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice AuditReply_choice[] = {
+static const ber_choice AuditReply_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contextAuditResult_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_error_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_auditResult_impl },
@@ -3711,7 +3711,7 @@ static int dissect_auditValueReply(packet_info *pinfo, proto_tree *tree, tvbuff_
   return dissect_h248_AuditReply(FALSE, tvb, offset, pinfo, tree, hf_h248_auditValueReply);
 }
 
-static ber_sequence NotifyReply_sequence[] = {
+static const ber_sequence NotifyReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl },
   { 0, 0, 0, NULL }
@@ -3728,7 +3728,7 @@ static int dissect_notifyReply_impl(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_h248_NotifyReply(TRUE, tvb, offset, pinfo, tree, hf_h248_notifyReply);
 }
 
-static ber_sequence ServiceChangeResParm_sequence[] = {
+static const ber_sequence ServiceChangeResParm_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_serviceChangeMgcId },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_serviceChangeAddress },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceChangeVersion_impl },
@@ -3755,7 +3755,7 @@ static const value_string ServiceChangeResult_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice ServiceChangeResult_choice[] = {
+static const ber_choice ServiceChangeResult_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceChangeResParms_impl },
   { 0, 0, 0, 0, NULL }
@@ -3772,7 +3772,7 @@ static int dissect_serviceChangeResult(packet_info *pinfo, proto_tree *tree, tvb
   return dissect_h248_ServiceChangeResult(FALSE, tvb, offset, pinfo, tree, hf_h248_serviceChangeResult);
 }
 
-static ber_sequence ServiceChangeReply_sequence[] = {
+static const ber_sequence ServiceChangeReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_serviceChangeResult },
   { 0, 0, 0, NULL }
@@ -3802,7 +3802,7 @@ static const value_string CommandReply_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice CommandReply_choice[] = {
+static const ber_choice CommandReply_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_addReply_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_moveReply_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_modReply_impl },
@@ -3825,7 +3825,7 @@ static int dissect_commandReply_item(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_h248_CommandReply(FALSE, tvb, offset, pinfo, tree, hf_h248_commandReply_item);
 }
 
-static ber_sequence SEQUNCE_OF_CommandReply_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_CommandReply_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_commandReply_item },
 };
 
@@ -3840,7 +3840,7 @@ static int dissect_commandReply_impl(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_h248_SEQUNCE_OF_CommandReply(TRUE, tvb, offset, pinfo, tree, hf_h248_commandReply);
 }
 
-static ber_sequence ActionReply_sequence[] = {
+static const ber_sequence ActionReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contextId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_contextReply_impl },
@@ -3859,7 +3859,7 @@ static int dissect_actionReplies_item(packet_info *pinfo, proto_tree *tree, tvbu
   return dissect_h248_ActionReply(FALSE, tvb, offset, pinfo, tree, hf_h248_actionReplies_item);
 }
 
-static ber_sequence SEQUNCE_OF_ActionReply_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_ActionReply_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actionReplies_item },
 };
 
@@ -3881,7 +3881,7 @@ static const value_string T_transactionResult_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice T_transactionResult_choice[] = {
+static const ber_choice T_transactionResult_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionError_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actionReplies_impl },
   { 0, 0, 0, 0, NULL }
@@ -3898,7 +3898,7 @@ static int dissect_transactionResult(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_h248_T_transactionResult(FALSE, tvb, offset, pinfo, tree, hf_h248_transactionResult);
 }
 
-static ber_sequence TransactionReply_sequence[] = {
+static const ber_sequence TransactionReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_immAckRequired_impl },
   { BER_CLASS_CON, 2, 0, dissect_transactionResult },
@@ -3916,7 +3916,7 @@ static int dissect_transactionReply_impl(packet_info *pinfo, proto_tree *tree, t
   return dissect_h248_TransactionReply(TRUE, tvb, offset, pinfo, tree, hf_h248_transactionReply);
 }
 
-static ber_sequence TransactionAck_sequence[] = {
+static const ber_sequence TransactionAck_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_firstAck_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lastAck_impl },
   { 0, 0, 0, NULL }
@@ -3933,7 +3933,7 @@ static int dissect_TransactionResponseAck_item(packet_info *pinfo, proto_tree *t
   return dissect_h248_TransactionAck(FALSE, tvb, offset, pinfo, tree, hf_h248_TransactionResponseAck_item);
 }
 
-static ber_sequence TransactionResponseAck_sequence_of[1] = {
+static const ber_sequence TransactionResponseAck_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TransactionResponseAck_item },
 };
 
@@ -3957,7 +3957,7 @@ static const value_string Transaction_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice Transaction_choice[] = {
+static const ber_choice Transaction_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionRequest_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transactionPending_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_transactionReply_impl },
@@ -3976,7 +3976,7 @@ static int dissect_transactions_item(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_h248_Transaction(FALSE, tvb, offset, pinfo, tree, hf_h248_transactions_item);
 }
 
-static ber_sequence SEQUNCE_OF_Transaction_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_Transaction_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_transactions_item },
 };
 
@@ -3998,7 +3998,7 @@ static const value_string T_messageBody_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice T_messageBody_choice[] = {
+static const ber_choice T_messageBody_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_messageError_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transactions_impl },
   { 0, 0, 0, 0, NULL }
@@ -4015,7 +4015,7 @@ static int dissect_messageBody(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
   return dissect_h248_T_messageBody(FALSE, tvb, offset, pinfo, tree, hf_h248_messageBody);
 }
 
-static ber_sequence Message_sequence[] = {
+static const ber_sequence Message_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_version_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mId },
   { BER_CLASS_CON, 2, 0, dissect_messageBody },
@@ -4033,7 +4033,7 @@ static int dissect_mess_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
   return dissect_h248_Message(TRUE, tvb, offset, pinfo, tree, hf_h248_mess);
 }
 
-static ber_sequence MegacoMessage_sequence[] = {
+static const ber_sequence MegacoMessage_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authHeader_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mess_impl },
   { 0, 0, 0, NULL }
@@ -5330,9 +5330,6 @@ void proto_reg_handoff_h248(void) {
   dissector_handle_t h248_handle;
 
   h248_handle = find_dissector("h248");
-  /*
-   * Handle the dissection of Media stream properties H.248.1 Annex C in this dissector 
-   */
 
   dissector_add("m3ua.protocol_data_si", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
 }
diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c
index eea509b522..30b237aea6 100644
--- a/epan/dissectors/packet-ns_cert_exts.c
+++ b/epan/dissectors/packet-ns_cert_exts.c
@@ -8,7 +8,7 @@
 /* packet-ns_cert_exts.c
  * Routines for NetScape Certificate Extensions packet dissection
  *
- * $Id: packet-ns_cert_exts-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
+ * $Id: packet-ns_cert_exts-template.c 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -152,7 +152,7 @@ dissect_ns_cert_exts_CertRenewalUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, in
   return offset;
 }
 
-static asn_namedbit CertType_bits[] = {
+static const asn_namedbit CertType_bits[] = {
   {  0, &hf_ns_cert_exts_CertType_client, -1, -1, NULL, NULL },
   {  1, &hf_ns_cert_exts_CertType_server, -1, -1, NULL, NULL },
   {  5, &hf_ns_cert_exts_CertType_ca, -1, -1, NULL, NULL },
diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c
index 58a9d62e5a..7520fa6ce4 100644
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@@ -1,15 +1,14 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-pkcs1.c                                                             */
+/* ./packet-pkcs1.c                                                           */
 /* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
 
 /* Input file: packet-pkcs1-template.c */
-/* Include files: packet-pkcs1-hf.c, packet-pkcs1-ett.c, packet-pkcs1-fn.c, packet-pkcs1-hfarr.c, packet-pkcs1-ettarr.c, packet-pkcs1-val.h */
 
 /* packet-pkcs1.c
  * Routines for PKCS#1/RFC2313 packet dissection
  *
- * $Id: packet-pkcs1-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
+ * $Id: packet-pkcs1-template.c 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -53,11 +52,6 @@ static int proto_pkcs1 = -1;
 
 /*--- Included file: packet-pkcs1-hf.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-pkcs1-hf.c                                                          */
-/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
-
 static int hf_pkcs1_modulus = -1;                 /* INTEGER */
 static int hf_pkcs1_publicExponent = -1;          /* INTEGER */
 static int hf_pkcs1_version = -1;                 /* Version */
@@ -77,11 +71,6 @@ static int hf_pkcs1_digest = -1;                  /* Digest */
 
 /*--- Included file: packet-pkcs1-ett.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-pkcs1-ett.c                                                         */
-/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
-
 static gint ett_pkcs1_RSAPublicKey = -1;
 static gint ett_pkcs1_RSAPrivateKey = -1;
 static gint ett_pkcs1_DigestInfo = -1;
@@ -92,11 +81,6 @@ static gint ett_pkcs1_DigestInfo = -1;
 
 /*--- Included file: packet-pkcs1-fn.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-pkcs1-fn.c                                                          */
-/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
-
 /*--- Fields for imported types ---*/
 
 
@@ -133,7 +117,7 @@ static int dissect_coefficient(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
   return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_coefficient);
 }
 
-static ber_sequence RSAPublicKey_sequence[] = {
+static const ber_sequence RSAPublicKey_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent },
   { 0, 0, 0, NULL }
@@ -159,7 +143,7 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_pkcs1_Version(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_version);
 }
 
-static ber_sequence RSAPrivateKey_sequence[] = {
+static const ber_sequence RSAPrivateKey_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent },
@@ -203,7 +187,7 @@ static int dissect_digest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
   return dissect_pkcs1_Digest(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_digest);
 }
 
-static ber_sequence DigestInfo_sequence[] = {
+static const ber_sequence DigestInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_digest },
   { 0, 0, 0, NULL }
@@ -229,11 +213,6 @@ void proto_register_pkcs1(void) {
 
 /*--- Included file: packet-pkcs1-hfarr.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-pkcs1-hfarr.c                                                       */
-/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
-
     { &hf_pkcs1_modulus,
       { "modulus", "pkcs1.modulus",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -288,11 +267,6 @@ void proto_register_pkcs1(void) {
 
 /*--- Included file: packet-pkcs1-ettarr.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-pkcs1-ettarr.c                                                      */
-/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
-
     &ett_pkcs1_RSAPublicKey,
     &ett_pkcs1_RSAPrivateKey,
     &ett_pkcs1_DigestInfo,
diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h
index c4a6f27ec8..76505ee474 100644
--- a/epan/dissectors/packet-pkcs1.h
+++ b/epan/dissectors/packet-pkcs1.h
@@ -1,15 +1,14 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-pkcs1.h                                                             */
+/* ./packet-pkcs1.h                                                           */
 /* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
 
 /* Input file: packet-pkcs1-template.h */
-/* Include files: packet-pkcs1-exp.h, packet-pkcs1-valexp.h */
 
 /* packet-pkcs1.h
  * Routines for PKCS#1/RFC2313 packet dissection
  *
- * $Id: packet-pkcs1-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
+ * $Id: packet-pkcs1-template.h 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -36,11 +35,6 @@
 
 /*--- Included file: packet-pkcs1-exp.h ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-pkcs1-exp.h                                                         */
-/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
-
 int dissect_pkcs1_RSAPublicKey(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_pkcs1_RSAPrivateKey(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_pkcs1_DigestInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c
index c807c89ed3..750283a46b 100644
--- a/epan/dissectors/packet-pkinit.c
+++ b/epan/dissectors/packet-pkinit.c
@@ -8,7 +8,7 @@
 /* packet-pkinit.c
  * Routines for PKINIT packet dissection
  *
- * $Id: packet-pkinit-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
+ * $Id: packet-pkinit-template.c 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -110,7 +110,7 @@ static const value_string TrustedCA_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice TrustedCA_choice[] = {
+static const ber_choice TrustedCA_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_caName },
   {   2, BER_CLASS_CON, 2, 0, dissect_issuerAndSerial },
   { 0, 0, 0, 0, NULL }
@@ -127,7 +127,7 @@ static int dissect_trustedCertifiers_item(packet_info *pinfo, proto_tree *tree,
   return dissect_pkinit_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers_item);
 }
 
-static ber_sequence SEQUNCE_OF_TrustedCA_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_TrustedCA_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item },
 };
 
@@ -142,7 +142,7 @@ static int dissect_trustedCertifiers(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_pkinit_SEQUNCE_OF_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers);
 }
 
-static ber_sequence PaPkAsReq_sequence[] = {
+static const ber_sequence PaPkAsReq_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_signedAuthPack },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_trustedCertifiers },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_kdcCert },
@@ -164,7 +164,7 @@ static const value_string PaPkAsRep_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice PaPkAsRep_choice[] = {
+static const ber_choice PaPkAsRep_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_dhSignedData },
   {   1, BER_CLASS_CON, 1, 0, dissect_encKeyPack },
   { 0, 0, 0, 0, NULL }
@@ -212,7 +212,7 @@ void proto_register_pkinit(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PaPkAsReq/trustedCertifiers", HFILL }},
     { &hf_pkinit_trustedCertifiers_item,
-      { "Item[##]", "pkinit.trustedCertifiers_item",
+      { "Item", "pkinit.trustedCertifiers_item",
         FT_UINT32, BASE_DEC, VALS(TrustedCA_vals), 0,
         "PaPkAsReq/trustedCertifiers/_item", HFILL }},
     { &hf_pkinit_kdcCert,
diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c
index ae5a731794..e5dae121b0 100644
--- a/epan/dissectors/packet-pkix1explicit.c
+++ b/epan/dissectors/packet-pkix1explicit.c
@@ -10,7 +10,7 @@
 /* packet-pkix1explicit.c
  * Routines for PKIX1Explitic packet dissection
  *
- * $Id: packet-pkix1explicit-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
+ * $Id: packet-pkix1explicit-template.c 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -143,7 +143,7 @@ static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
   return dissect_pkix1explicit_TeletexString(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value);
 }
 
-static ber_sequence TeletexDomainDefinedAttribute_sequence[] = {
+static const ber_sequence TeletexDomainDefinedAttribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_value },
   { 0, 0, 0, NULL }
diff --git a/epan/dissectors/packet-pkix1explicit.h b/epan/dissectors/packet-pkix1explicit.h
index 0b6129b87e..76b734d2e3 100644
--- a/epan/dissectors/packet-pkix1explicit.h
+++ b/epan/dissectors/packet-pkix1explicit.h
@@ -8,7 +8,7 @@
 /* packet-pkix1explicit.h
  * Routines for PKIX1Explicit packet dissection
  *
- * $Id: packet-pkix1explicit-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
+ * $Id: packet-pkix1explicit-template.h 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c
index 933299a0fc..b03f723f2a 100644
--- a/epan/dissectors/packet-pkix1implicit.c
+++ b/epan/dissectors/packet-pkix1implicit.c
@@ -8,7 +8,7 @@
 /* packet-pkix1implicit.c
  * Routines for PKIX1Implitic packet dissection
  *
- * $Id: packet-pkix1implicit-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
+ * $Id: packet-pkix1implicit-template.c 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -130,7 +130,7 @@ static const value_string DisplayText_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice DisplayText_choice[] = {
+static const ber_choice DisplayText_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_visibleString },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_BMPString, BER_FLAGS_NOOWNTAG, dissect_bmpString },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_utf8String },
@@ -163,7 +163,7 @@ static int dissect_noticeNumbers_item(packet_info *pinfo, proto_tree *tree, tvbu
   return dissect_pkix1implicit_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers_item);
 }
 
-static ber_sequence SEQUNCE_OF_INTEGER_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_INTEGER_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers_item },
 };
 
@@ -178,7 +178,7 @@ static int dissect_noticeNumbers(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_pkix1implicit_SEQUNCE_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers);
 }
 
-static ber_sequence NoticeReference_sequence[] = {
+static const ber_sequence NoticeReference_sequence[] = {
   { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_organization },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers },
   { 0, 0, 0, NULL }
@@ -195,7 +195,7 @@ static int dissect_noticeRef(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
   return dissect_pkix1implicit_NoticeReference(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeRef);
 }
 
-static ber_sequence UserNotice_sequence[] = {
+static const ber_sequence UserNotice_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_noticeRef },
   { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_explicitText },
   { 0, 0, 0, NULL }
@@ -239,7 +239,7 @@ void proto_register_pkix1implicit(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "NoticeReference/noticeNumbers", HFILL }},
     { &hf_pkix1implicit_noticeNumbers_item,
-      { "Item[##]", "pkix1implicit.noticeNumbers_item",
+      { "Item", "pkix1implicit.noticeNumbers_item",
         FT_INT32, BASE_DEC, NULL, 0,
         "NoticeReference/noticeNumbers/_item", HFILL }},
     { &hf_pkix1implicit_visibleString,
diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h
index 322cdde86b..b3d6628d3b 100644
--- a/epan/dissectors/packet-pkix1implicit.h
+++ b/epan/dissectors/packet-pkix1implicit.h
@@ -8,7 +8,7 @@
 /* packet-pkix1implicit.h
  * Routines for PKIX1Implicit packet dissection
  *
- * $Id: packet-pkix1implicit-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
+ * $Id: packet-pkix1implicit-template.h 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index b555ed75be..1fa165c10a 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -8,7 +8,7 @@
 /* packet-x509af.c
  * Routines for X.509 Authentication Framework packet dissection
  *
- * $Id: packet-x509af-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
+ * $Id: packet-x509af-template.c 12245 2004-10-08 20:28:04Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -192,7 +192,7 @@ dissect_hf_x509af_extension_type(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return offset;
 }
 
-static ber_sequence Extension_sequence[] = {
+static const ber_sequence Extension_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_x509af_extension_id },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical },
   { BER_CLASS_ANY, 0, 0, dissect_hf_x509af_extension_type },
@@ -225,7 +225,7 @@ dissect_hf_x509af_algorithm_type(packet_info *pinfo, proto_tree *tree, tvbuff_t
 }
 
 /* Algorithm Identifier can not yet be handled by the compiler */
-static ber_sequence AlgorithmIdentifier_sequence[] = {
+static const ber_sequence AlgorithmIdentifier_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_x509af_algorithm_id },
   { BER_CLASS_ANY, 0, 0, dissect_hf_x509af_algorithm_type },
   { 0, 0, 0, NULL }
@@ -368,7 +368,7 @@ static const value_string Time_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice Time_choice[] = {
+static const ber_choice Time_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalizedTime },
   { 0, 0, 0, 0, NULL }
@@ -397,7 +397,7 @@ static int dissect_revocationDate(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_x509af_Time(FALSE, tvb, offset, pinfo, tree, hf_x509af_revocationDate);
 }
 
-static ber_sequence Validity_sequence[] = {
+static const ber_sequence Validity_sequence[] = {
   { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore },
   { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter },
   { 0, 0, 0, NULL }
@@ -430,7 +430,7 @@ static int dissect_subjectPublicKey(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_x509af_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509af_subjectPublicKey);
 }
 
-static ber_sequence SubjectPublicKeyInfo_sequence[] = {
+static const ber_sequence SubjectPublicKeyInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectPublicKey },
   { 0, 0, 0, NULL }
@@ -451,7 +451,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_
   return dissect_x509af_Extension(FALSE, tvb, offset, pinfo, tree, hf_x509af_Extensions_item);
 }
 
-static ber_sequence Extensions_sequence_of[1] = {
+static const ber_sequence Extensions_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
 };
 
@@ -472,7 +472,7 @@ static int dissect_crlExtensions(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_x509af_Extensions(FALSE, tvb, offset, pinfo, tree, hf_x509af_crlExtensions);
 }
 
-static ber_sequence T_signedCertificate_sequence[] = {
+static const ber_sequence T_signedCertificate_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
@@ -497,7 +497,7 @@ static int dissect_signedCertificate(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_x509af_T_signedCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificate);
 }
 
-static ber_sequence Certificate_sequence[] = {
+static const ber_sequence Certificate_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -527,7 +527,7 @@ static int dissect_certificate(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
   return dissect_x509af_Certificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificate);
 }
 
-static ber_sequence CrossCertificates_set_of[1] = {
+static const ber_sequence CrossCertificates_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CrossCertificates_item },
 };
 
@@ -542,7 +542,7 @@ static int dissect_ForwardCertificationPath_item(packet_info *pinfo, proto_tree
   return dissect_x509af_CrossCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_ForwardCertificationPath_item);
 }
 
-static ber_sequence ForwardCertificationPath_sequence_of[1] = {
+static const ber_sequence ForwardCertificationPath_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ForwardCertificationPath_item },
 };
 
@@ -557,7 +557,7 @@ static int dissect_certificationPath(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_x509af_ForwardCertificationPath(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificationPath);
 }
 
-static ber_sequence Certificates_sequence[] = {
+static const ber_sequence Certificates_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_certificationPath },
   { 0, 0, 0, NULL }
@@ -571,7 +571,7 @@ dissect_x509af_Certificates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
   return offset;
 }
 
-static ber_sequence CertificatePair_sequence[] = {
+static const ber_sequence CertificatePair_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_issuedByThisCA },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_issuedToThisCA },
   { 0, 0, 0, NULL }
@@ -588,7 +588,7 @@ static int dissect_theCACertificates_item(packet_info *pinfo, proto_tree *tree,
   return dissect_x509af_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates_item);
 }
 
-static ber_sequence SEQUNCE_OF_CertificatePair_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_CertificatePair_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_theCACertificates_item },
 };
 
@@ -603,7 +603,7 @@ static int dissect_theCACertificates(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_x509af_SEQUNCE_OF_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates);
 }
 
-static ber_sequence CertificationPath_sequence[] = {
+static const ber_sequence CertificationPath_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_theCACertificates },
   { 0, 0, 0, NULL }
@@ -617,7 +617,7 @@ dissect_x509af_CertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
   return offset;
 }
 
-static ber_sequence T_revokedCertificates_item_sequence[] = {
+static const ber_sequence T_revokedCertificates_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_userCertificate1 },
   { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_revocationDate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_crlEntryExtensions },
@@ -635,7 +635,7 @@ static int dissect_revokedCertificates_item(packet_info *pinfo, proto_tree *tree
   return dissect_x509af_T_revokedCertificates_item(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates_item);
 }
 
-static ber_sequence T_revokedCertificates_sequence_of[1] = {
+static const ber_sequence T_revokedCertificates_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revokedCertificates_item },
 };
 
@@ -650,7 +650,7 @@ static int dissect_revokedCertificates(packet_info *pinfo, proto_tree *tree, tvb
   return dissect_x509af_T_revokedCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates);
 }
 
-static ber_sequence T_signedCertificateList_sequence[] = {
+static const ber_sequence T_signedCertificateList_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
   { BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer },
@@ -672,7 +672,7 @@ static int dissect_signedCertificateList(packet_info *pinfo, proto_tree *tree, t
   return dissect_x509af_T_signedCertificateList(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificateList);
 }
 
-static ber_sequence CertificateList_sequence[] = {
+static const ber_sequence CertificateList_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificateList },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -687,7 +687,7 @@ dissect_x509af_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
   return offset;
 }
 
-static ber_sequence IssuerSerial_sequence[] = {
+static const ber_sequence IssuerSerial_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer1 },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serial },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerUID },
@@ -712,7 +712,7 @@ static const value_string InfoSubject_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice InfoSubject_choice[] = {
+static const ber_choice InfoSubject_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID },
   {   1, BER_CLASS_CON, 1, 0, dissect_infoSubjectName },
   { 0, 0, 0, 0, NULL }
@@ -729,7 +729,7 @@ static int dissect_info_subject(packet_info *pinfo, proto_tree *tree, tvbuff_t *
   return dissect_x509af_InfoSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_info_subject);
 }
 
-static ber_sequence AttCertValidityPeriod_sequence[] = {
+static const ber_sequence AttCertValidityPeriod_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notBeforeTime },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notAfterTime },
   { 0, 0, 0, NULL }
@@ -746,7 +746,7 @@ static int dissect_attCertValidityPeriod(packet_info *pinfo, proto_tree *tree, t
   return dissect_x509af_AttCertValidityPeriod(FALSE, tvb, offset, pinfo, tree, hf_x509af_attCertValidityPeriod);
 }
 
-static ber_sequence SEQUNCE_OF_Attribute_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_Attribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item },
 };
 
@@ -761,7 +761,7 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
   return dissect_x509af_SEQUNCE_OF_Attribute(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributes);
 }
 
-static ber_sequence AttributeCertificateInfo_sequence[] = {
+static const ber_sequence AttributeCertificateInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info_subject },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer1 },
@@ -785,7 +785,7 @@ static int dissect_signedAttributeCertificateInfo(packet_info *pinfo, proto_tree
   return dissect_x509af_AttributeCertificateInfo(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedAttributeCertificateInfo);
 }
 
-static ber_sequence AttributeCertificate_sequence[] = {
+static const ber_sequence AttributeCertificate_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAttributeCertificateInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -803,7 +803,7 @@ static int dissect_attributeCertificate(packet_info *pinfo, proto_tree *tree, tv
   return dissect_x509af_AttributeCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributeCertificate);
 }
 
-static ber_sequence ACPathData_sequence[] = {
+static const ber_sequence ACPathData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certificate },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_attributeCertificate },
   { 0, 0, 0, NULL }
@@ -820,7 +820,7 @@ static int dissect_acPath_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
   return dissect_x509af_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath_item);
 }
 
-static ber_sequence SEQUNCE_OF_ACPathData_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_ACPathData_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_acPath_item },
 };
 
@@ -835,7 +835,7 @@ static int dissect_acPath(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
   return dissect_x509af_SEQUNCE_OF_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath);
 }
 
-static ber_sequence AttributeCertificationPath_sequence[] = {
+static const ber_sequence AttributeCertificationPath_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeCertificate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_acPath },
   { 0, 0, 0, NULL }
@@ -856,7 +856,7 @@ static const value_string AssertionSubject_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice AssertionSubject_choice[] = {
+static const ber_choice AssertionSubject_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID },
   {   1, BER_CLASS_CON, 1, 0, dissect_assertionSubjectName },
   { 0, 0, 0, 0, NULL }
@@ -873,7 +873,7 @@ static int dissect_assertion_subject(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_x509af_AssertionSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_assertion_subject);
 }
 
-static ber_sequence SET_OF_AttributeType_set_of[1] = {
+static const ber_sequence SET_OF_AttributeType_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attType_item },
 };
 
@@ -888,7 +888,7 @@ static int dissect_attType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_x509af_SET_OF_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_x509af_attType);
 }
 
-static ber_sequence AttributeCertificateAssertion_sequence[] = {
+static const ber_sequence AttributeCertificateAssertion_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_assertion_subject },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_assertionIssuer },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_attCertValidity },
@@ -1037,7 +1037,7 @@ void proto_register_x509af(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Time/generalizedTime", HFILL }},
     { &hf_x509af_Extensions_item,
-      { "Item[##]", "x509af.Extensions_item",
+      { "Item", "x509af.Extensions_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extensions/_item", HFILL }},
     { &hf_x509af_userCertificate,
@@ -1049,11 +1049,11 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Certificates/certificationPath", HFILL }},
     { &hf_x509af_ForwardCertificationPath_item,
-      { "Item[##]", "x509af.ForwardCertificationPath_item",
+      { "Item", "x509af.ForwardCertificationPath_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ForwardCertificationPath/_item", HFILL }},
     { &hf_x509af_CrossCertificates_item,
-      { "Item(##)", "x509af.CrossCertificates_item",
+      { "Item", "x509af.CrossCertificates_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "CrossCertificates/_item", HFILL }},
     { &hf_x509af_theCACertificates,
@@ -1061,7 +1061,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CertificationPath/theCACertificates", HFILL }},
     { &hf_x509af_theCACertificates_item,
-      { "Item[##]", "x509af.theCACertificates_item",
+      { "Item", "x509af.theCACertificates_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificationPath/theCACertificates/_item", HFILL }},
     { &hf_x509af_issuedByThisCA,
@@ -1089,7 +1089,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CertificateList/signedCertificateList/revokedCertificates", HFILL }},
     { &hf_x509af_revokedCertificates_item,
-      { "Item[##]", "x509af.revokedCertificates_item",
+      { "Item", "x509af.revokedCertificates_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateList/signedCertificateList/revokedCertificates/_item", HFILL }},
     { &hf_x509af_userCertificate1,
@@ -1117,7 +1117,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AttributeCertificationPath/acPath", HFILL }},
     { &hf_x509af_acPath_item,
-      { "Item[##]", "x509af.acPath_item",
+      { "Item", "x509af.acPath_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCertificationPath/acPath/_item", HFILL }},
     { &hf_x509af_certificate,
@@ -1153,7 +1153,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AttributeCertificateInfo/attributes", HFILL }},
     { &hf_x509af_attributes_item,
-      { "Item[##]", "x509af.attributes_item",
+      { "Item", "x509af.attributes_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCertificateInfo/attributes/_item", HFILL }},
     { &hf_x509af_issuerUniqueID,
@@ -1197,7 +1197,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AttributeCertificateAssertion/attType", HFILL }},
     { &hf_x509af_attType_item,
-      { "Item(##)", "x509af.attType_item",
+      { "Item", "x509af.attType_item",
         FT_STRING, BASE_NONE, NULL, 0,
         "AttributeCertificateAssertion/attType/_item", HFILL }},
 
diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h
index 9fea7025a0..4cc3208414 100644
--- a/epan/dissectors/packet-x509af.h
+++ b/epan/dissectors/packet-x509af.h
@@ -8,7 +8,7 @@
 /* packet-x509af.h
  * Routines for X.509 Authentication Framework packet dissection
  *
- * $Id: packet-x509af-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
+ * $Id: packet-x509af-template.h 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 5e576e0bed..f090ebc2dd 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -8,7 +8,7 @@
 /* packet-x509ce.c
  * Routines for X.509 Certificate Extensions packet dissection
  *
- * $Id: packet-x509ce-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
+ * $Id: packet-x509ce-template.c 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -277,7 +277,7 @@ static int dissect_uniformResourceIdentifier_impl(packet_info *pinfo, proto_tree
   return dissect_x509ce_IA5String(TRUE, tvb, offset, pinfo, tree, hf_x509ce_uniformResourceIdentifier);
 }
 
-static ber_sequence EDIPartyName_sequence[] = {
+static const ber_sequence EDIPartyName_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameAssigner_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_partyName_impl },
   { 0, 0, 0, NULL }
@@ -330,7 +330,7 @@ static const value_string GeneralName_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice GeneralName_choice[] = {
+static const ber_choice GeneralName_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_rfc822Name_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_dNSName_impl },
   {   4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_directoryName_impl },
@@ -367,7 +367,7 @@ static int dissect_deltaLocation(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_x509ce_GeneralName(FALSE, tvb, offset, pinfo, tree, hf_x509ce_deltaLocation);
 }
 
-static ber_sequence GeneralNames_sequence_of[1] = {
+static const ber_sequence GeneralNames_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item },
 };
 
@@ -391,7 +391,7 @@ static int dissect_fullName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_x509ce_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_x509ce_fullName);
 }
 
-static ber_sequence AuthorityKeyIdentifier_sequence[] = {
+static const ber_sequence AuthorityKeyIdentifier_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keyIdentifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertIssuer_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertSerialNumber_impl },
@@ -414,7 +414,7 @@ dissect_x509ce_SubjectKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, in
   return offset;
 }
 
-static asn_namedbit KeyUsage_bits[] = {
+static const asn_namedbit KeyUsage_bits[] = {
   {  0, &hf_x509ce_KeyUsage_digitalSignature, -1, -1, NULL, NULL },
   {  1, &hf_x509ce_KeyUsage_nonRepudiation, -1, -1, NULL, NULL },
   {  2, &hf_x509ce_KeyUsage_keyEncipherment, -1, -1, NULL, NULL },
@@ -448,7 +448,7 @@ static int dissect_KeyPurposeIDs_item(packet_info *pinfo, proto_tree *tree, tvbu
   return dissect_x509ce_KeyPurposeId(FALSE, tvb, offset, pinfo, tree, hf_x509ce_KeyPurposeIDs_item);
 }
 
-static ber_sequence KeyPurposeIDs_sequence_of[1] = {
+static const ber_sequence KeyPurposeIDs_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_KeyPurposeIDs_item },
 };
 
@@ -489,7 +489,7 @@ static int dissect_nextDelta(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
   return dissect_x509ce_GeneralizedTime(FALSE, tvb, offset, pinfo, tree, hf_x509ce_nextDelta);
 }
 
-static ber_sequence PrivateKeyUsagePeriod_sequence[] = {
+static const ber_sequence PrivateKeyUsagePeriod_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notBefore_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notAfter_impl },
   { 0, 0, 0, NULL }
@@ -521,7 +521,7 @@ static int dissect_subjectDomainPolicy(packet_info *pinfo, proto_tree *tree, tvb
   return dissect_x509ce_CertPolicyId(FALSE, tvb, offset, pinfo, tree, hf_x509ce_subjectDomainPolicy);
 }
 
-static ber_sequence PolicyQualifierInfo_sequence[] = {
+static const ber_sequence PolicyQualifierInfo_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
@@ -536,7 +536,7 @@ static int dissect_policyQualifiers_item(packet_info *pinfo, proto_tree *tree, t
   return dissect_x509ce_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers_item);
 }
 
-static ber_sequence SEQUNCE_OF_PolicyQualifierInfo_sequence_of[1] = {
+static const ber_sequence SEQUNCE_OF_PolicyQualifierInfo_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policyQualifiers_item },
 };
 
@@ -551,7 +551,7 @@ static int dissect_policyQualifiers(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_x509ce_SEQUNCE_OF_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers);
 }
 
-static ber_sequence PolicyInformation_sequence[] = {
+static const ber_sequence PolicyInformation_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policyQualifiers },
   { 0, 0, 0, NULL }
@@ -568,7 +568,7 @@ static int dissect_CertificatePoliciesSyntax_item(packet_info *pinfo, proto_tree
   return dissect_x509ce_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CertificatePoliciesSyntax_item);
 }
 
-static ber_sequence CertificatePoliciesSyntax_sequence_of[1] = {
+static const ber_sequence CertificatePoliciesSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificatePoliciesSyntax_item },
 };
 
@@ -580,7 +580,7 @@ dissect_x509ce_CertificatePoliciesSyntax(gboolean implicit_tag _U_, tvbuff_t *tv
   return offset;
 }
 
-static ber_sequence PolicyMappingsSyntax_item_sequence[] = {
+static const ber_sequence PolicyMappingsSyntax_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_issuerDomainPolicy },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_subjectDomainPolicy },
   { 0, 0, 0, NULL }
@@ -597,7 +597,7 @@ static int dissect_PolicyMappingsSyntax_item(packet_info *pinfo, proto_tree *tre
   return dissect_x509ce_PolicyMappingsSyntax_item(FALSE, tvb, offset, pinfo, tree, hf_x509ce_PolicyMappingsSyntax_item);
 }
 
-static ber_sequence PolicyMappingsSyntax_sequence_of[1] = {
+static const ber_sequence PolicyMappingsSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PolicyMappingsSyntax_item },
 };
 
@@ -609,7 +609,7 @@ dissect_x509ce_PolicyMappingsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, in
   return offset;
 }
 
-static ber_sequence AttributesSyntax_sequence_of[1] = {
+static const ber_sequence AttributesSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributesSyntax_item },
 };
 
@@ -671,7 +671,7 @@ static int dissect_modulus(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_x509ce_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509ce_modulus);
 }
 
-static ber_sequence BasicConstraintsSyntax_sequence[] = {
+static const ber_sequence BasicConstraintsSyntax_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cA },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pathLenConstraint },
   { 0, 0, 0, NULL }
@@ -700,7 +700,7 @@ static int dissect_maximum_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
   return dissect_x509ce_BaseDistance(TRUE, tvb, offset, pinfo, tree, hf_x509ce_maximum);
 }
 
-static ber_sequence GeneralSubtree_sequence[] = {
+static const ber_sequence GeneralSubtree_sequence[] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_base },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minimum_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximum_impl },
@@ -718,7 +718,7 @@ static int dissect_GeneralSubtrees_item(packet_info *pinfo, proto_tree *tree, tv
   return dissect_x509ce_GeneralSubtree(FALSE, tvb, offset, pinfo, tree, hf_x509ce_GeneralSubtrees_item);
 }
 
-static ber_sequence GeneralSubtrees_sequence_of[1] = {
+static const ber_sequence GeneralSubtrees_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GeneralSubtrees_item },
 };
 
@@ -736,7 +736,7 @@ static int dissect_excludedSubtrees_impl(packet_info *pinfo, proto_tree *tree, t
   return dissect_x509ce_GeneralSubtrees(TRUE, tvb, offset, pinfo, tree, hf_x509ce_excludedSubtrees);
 }
 
-static ber_sequence NameConstraintsSyntax_sequence[] = {
+static const ber_sequence NameConstraintsSyntax_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permittedSubtrees_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_excludedSubtrees_impl },
   { 0, 0, 0, NULL }
@@ -765,7 +765,7 @@ static int dissect_inhibitPolicyMapping_impl(packet_info *pinfo, proto_tree *tre
   return dissect_x509ce_SkipCerts(TRUE, tvb, offset, pinfo, tree, hf_x509ce_inhibitPolicyMapping);
 }
 
-static ber_sequence PolicyConstraintsSyntax_sequence[] = {
+static const ber_sequence PolicyConstraintsSyntax_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requireExplicitPolicy_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inhibitPolicyMapping_impl },
   { 0, 0, 0, NULL }
@@ -830,7 +830,7 @@ static const value_string DistributionPointName_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice DistributionPointName_choice[] = {
+static const ber_choice DistributionPointName_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fullName_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_nameRelativeToCRLIssuer_impl },
   { 0, 0, 0, 0, NULL }
@@ -847,7 +847,7 @@ static int dissect_distributionPoint_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_x509ce_DistributionPointName(TRUE, tvb, offset, pinfo, tree, hf_x509ce_distributionPoint);
 }
 
-static asn_namedbit OnlyCertificateTypes_bits[] = {
+static const asn_namedbit OnlyCertificateTypes_bits[] = {
   {  0, &hf_x509ce_OnlyCertificateTypes_userPublicKey, -1, -1, NULL, NULL },
   {  1, &hf_x509ce_OnlyCertificateTypes_cA, -1, -1, NULL, NULL },
   {  2, &hf_x509ce_OnlyCertificateTypes_userAttribute, -1, -1, NULL, NULL },
@@ -868,7 +868,7 @@ static int dissect_onlyContains_impl(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_x509ce_OnlyCertificateTypes(TRUE, tvb, offset, pinfo, tree, hf_x509ce_onlyContains);
 }
 
-static asn_namedbit ReasonFlags_bits[] = {
+static const asn_namedbit ReasonFlags_bits[] = {
   {  0, &hf_x509ce_ReasonFlags_unused, -1, -1, NULL, NULL },
   {  1, &hf_x509ce_ReasonFlags_keyCompromise, -1, -1, NULL, NULL },
   {  2, &hf_x509ce_ReasonFlags_cACompromise, -1, -1, NULL, NULL },
@@ -896,7 +896,7 @@ static int dissect_reasons_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
   return dissect_x509ce_ReasonFlags(TRUE, tvb, offset, pinfo, tree, hf_x509ce_reasons);
 }
 
-static ber_sequence NumberRange_sequence[] = {
+static const ber_sequence NumberRange_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startingNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_endingNumber_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_modulus },
@@ -929,7 +929,7 @@ static int dissect_cRLStreamIdentifier_impl(packet_info *pinfo, proto_tree *tree
   return dissect_x509ce_CRLStreamIdentifier(TRUE, tvb, offset, pinfo, tree, hf_x509ce_cRLStreamIdentifier);
 }
 
-static ber_sequence BaseRevocationInfo_sequence[] = {
+static const ber_sequence BaseRevocationInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLStreamIdentifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cRLNumber_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_baseThisUpdate_impl },
@@ -947,7 +947,7 @@ static int dissect_baseRevocationInfo_impl(packet_info *pinfo, proto_tree *tree,
   return dissect_x509ce_BaseRevocationInfo(TRUE, tvb, offset, pinfo, tree, hf_x509ce_baseRevocationInfo);
 }
 
-static ber_sequence PerAuthorityScope_sequence[] = {
+static const ber_sequence PerAuthorityScope_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_authorityName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_onlyContains_impl },
@@ -970,7 +970,7 @@ static int dissect_CRLScopeSyntax_item(packet_info *pinfo, proto_tree *tree, tvb
   return dissect_x509ce_PerAuthorityScope(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CRLScopeSyntax_item);
 }
 
-static ber_sequence CRLScopeSyntax_sequence_of[1] = {
+static const ber_sequence CRLScopeSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLScopeSyntax_item },
 };
 
@@ -985,7 +985,7 @@ static int dissect_cRLScope(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_x509ce_CRLScopeSyntax(FALSE, tvb, offset, pinfo, tree, hf_x509ce_cRLScope);
 }
 
-static ber_sequence DeltaRefInfo_sequence[] = {
+static const ber_sequence DeltaRefInfo_sequence[] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastDelta },
   { 0, 0, 0, NULL }
@@ -1002,7 +1002,7 @@ static int dissect_deltaRefInfo_impl(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_x509ce_DeltaRefInfo(TRUE, tvb, offset, pinfo, tree, hf_x509ce_deltaRefInfo);
 }
 
-static ber_sequence CRLReferral_sequence[] = {
+static const ber_sequence CRLReferral_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_issuer_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_location_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_deltaRefInfo_impl },
@@ -1029,7 +1029,7 @@ static const value_string StatusReferral_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice StatusReferral_choice[] = {
+static const ber_choice StatusReferral_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cRLReferral_impl },
   { 0, 0, 0, 0, NULL }
 };
@@ -1045,7 +1045,7 @@ static int dissect_StatusReferrals_item(packet_info *pinfo, proto_tree *tree, tv
   return dissect_x509ce_StatusReferral(FALSE, tvb, offset, pinfo, tree, hf_x509ce_StatusReferrals_item);
 }
 
-static ber_sequence StatusReferrals_sequence_of[1] = {
+static const ber_sequence StatusReferrals_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item },
 };
 
@@ -1072,7 +1072,7 @@ dissect_x509ce_OrderedListSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
   return offset;
 }
 
-static ber_sequence DeltaInformation_sequence[] = {
+static const ber_sequence DeltaInformation_sequence[] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nextDelta },
   { 0, 0, 0, NULL }
@@ -1086,7 +1086,7 @@ dissect_x509ce_DeltaInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
   return offset;
 }
 
-static ber_sequence DistributionPoint_sequence[] = {
+static const ber_sequence DistributionPoint_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasons_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLIssuer_impl },
@@ -1104,7 +1104,7 @@ static int dissect_CRLDistPointsSyntax_item(packet_info *pinfo, proto_tree *tree
   return dissect_x509ce_DistributionPoint(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CRLDistPointsSyntax_item);
 }
 
-static ber_sequence CRLDistPointsSyntax_sequence_of[1] = {
+static const ber_sequence CRLDistPointsSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLDistPointsSyntax_item },
 };
 
@@ -1116,7 +1116,7 @@ dissect_x509ce_CRLDistPointsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int
   return offset;
 }
 
-static ber_sequence IssuingDistPointSyntax_sequence[] = {
+static const ber_sequence IssuingDistPointSyntax_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsUserPublicKeyCerts_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsCACerts_impl },
@@ -1361,7 +1361,7 @@ void proto_register_x509ce(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "AuthorityKeyIdentifier/authorityCertSerialNumber", HFILL }},
     { &hf_x509ce_KeyPurposeIDs_item,
-      { "Item[##]", "x509ce.KeyPurposeIDs_item",
+      { "Item", "x509ce.KeyPurposeIDs_item",
         FT_STRING, BASE_NONE, NULL, 0,
         "KeyPurposeIDs/_item", HFILL }},
     { &hf_x509ce_notBefore,
@@ -1373,7 +1373,7 @@ void proto_register_x509ce(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "PrivateKeyUsagePeriod/notAfter", HFILL }},
     { &hf_x509ce_CertificatePoliciesSyntax_item,
-      { "Item[##]", "x509ce.CertificatePoliciesSyntax_item",
+      { "Item", "x509ce.CertificatePoliciesSyntax_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificatePoliciesSyntax/_item", HFILL }},
     { &hf_x509ce_policyIdentifier,
@@ -1385,11 +1385,11 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PolicyInformation/policyQualifiers", HFILL }},
     { &hf_x509ce_policyQualifiers_item,
-      { "Item[##]", "x509ce.policyQualifiers_item",
+      { "Item", "x509ce.policyQualifiers_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "PolicyInformation/policyQualifiers/_item", HFILL }},
     { &hf_x509ce_PolicyMappingsSyntax_item,
-      { "Item[##]", "x509ce.PolicyMappingsSyntax_item",
+      { "Item", "x509ce.PolicyMappingsSyntax_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "PolicyMappingsSyntax/_item", HFILL }},
     { &hf_x509ce_issuerDomainPolicy,
@@ -1401,7 +1401,7 @@ void proto_register_x509ce(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "PolicyMappingsSyntax/_item/subjectDomainPolicy", HFILL }},
     { &hf_x509ce_GeneralNames_item,
-      { "Item[##]", "x509ce.GeneralNames_item",
+      { "Item", "x509ce.GeneralNames_item",
         FT_UINT32, BASE_DEC, VALS(GeneralName_vals), 0,
         "GeneralNames/_item", HFILL }},
     { &hf_x509ce_rfc822Name,
@@ -1441,7 +1441,7 @@ void proto_register_x509ce(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "EDIPartyName/partyName", HFILL }},
     { &hf_x509ce_AttributesSyntax_item,
-      { "Item[##]", "x509ce.AttributesSyntax_item",
+      { "Item", "x509ce.AttributesSyntax_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributesSyntax/_item", HFILL }},
     { &hf_x509ce_cA,
@@ -1461,7 +1461,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "NameConstraintsSyntax/excludedSubtrees", HFILL }},
     { &hf_x509ce_GeneralSubtrees_item,
-      { "Item[##]", "x509ce.GeneralSubtrees_item",
+      { "Item", "x509ce.GeneralSubtrees_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralSubtrees/_item", HFILL }},
     { &hf_x509ce_base,
@@ -1485,7 +1485,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PolicyConstraintsSyntax/inhibitPolicyMapping", HFILL }},
     { &hf_x509ce_CRLScopeSyntax_item,
-      { "Item[##]", "x509ce.CRLScopeSyntax_item",
+      { "Item", "x509ce.CRLScopeSyntax_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "CRLScopeSyntax/_item", HFILL }},
     { &hf_x509ce_authorityName,
@@ -1545,7 +1545,7 @@ void proto_register_x509ce(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "BaseRevocationInfo/baseThisUpdate", HFILL }},
     { &hf_x509ce_StatusReferrals_item,
-      { "Item[##]", "x509ce.StatusReferrals_item",
+      { "Item", "x509ce.StatusReferrals_item",
         FT_UINT32, BASE_DEC, VALS(StatusReferral_vals), 0,
         "StatusReferrals/_item", HFILL }},
     { &hf_x509ce_cRLReferral,
@@ -1589,7 +1589,7 @@ void proto_register_x509ce(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "DeltaInformation/nextDelta", HFILL }},
     { &hf_x509ce_CRLDistPointsSyntax_item,
-      { "Item[##]", "x509ce.CRLDistPointsSyntax_item",
+      { "Item", "x509ce.CRLDistPointsSyntax_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "CRLDistPointsSyntax/_item", HFILL }},
     { &hf_x509ce_reasons,
diff --git a/epan/dissectors/packet-x509ce.h b/epan/dissectors/packet-x509ce.h
index 87707fc311..aa35e55bfc 100644
--- a/epan/dissectors/packet-x509ce.h
+++ b/epan/dissectors/packet-x509ce.h
@@ -8,7 +8,7 @@
 /* packet-x509ce.h
  * Routines for X.509 Certificate Extensions packet dissection
  *
- * $Id: packet-x509ce-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
+ * $Id: packet-x509ce-template.h 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index a72e931e0c..17388a5cf2 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -1,15 +1,14 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509if.c                                                            */
+/* ./packet-x509if.c                                                          */
 /* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
 
 /* Input file: packet-x509if-template.c */
-/* Include files: packet-x509if-hf.c, packet-x509if-ett.c, packet-x509if-fn.c, packet-x509if-hfarr.c, packet-x509if-ettarr.c, packet-x509if-val.h */
 
 /* packet-x509if.c
  * Routines for X.509 Information Framework packet dissection
  *
- * $Id: packet-x509if-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
+ * $Id: packet-x509if-template.c 12245 2004-10-08 20:28:04Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -54,11 +53,6 @@ int hf_x509if_ATADV_attribute_id = -1;
 
 /*--- Included file: packet-x509if-hf.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509if-hf.c                                                         */
-/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
-
 static int hf_x509if_rdnSequence = -1;            /* RDNSequence */
 static int hf_x509if_RDNSequence_item = -1;       /* RelativeDistinguishedName */
 static int hf_x509if_RelativeDistinguishedName_item = -1;  /* AttributeTypeAndDistinguishedValue */
@@ -75,11 +69,6 @@ static gint ett_x509if_Attribute = -1;
 
 /*--- Included file: packet-x509if-ett.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509if-ett.c                                                        */
-/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
-
 static gint ett_x509if_Name = -1;
 static gint ett_x509if_RDNSequence = -1;
 static gint ett_x509if_RelativeDistinguishedName = -1;
@@ -90,7 +79,7 @@ static gint ett_x509if_AllowedSubset = -1;
 
 
 
-static ber_sequence Attribute_sequence[] = {
+static const ber_sequence Attribute_sequence[] = {
   /*  { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_x509if_type },*/
   /*XXX  missing stuff here */
   { 0, 0, 0, NULL }
@@ -121,7 +110,7 @@ dissect_hf_x509if_ATADV_attribute_value(packet_info *pinfo, proto_tree *tree, tv
   return offset;
 }
 
-static ber_sequence AttributeTypeAndDistinguishedValue_sequence[] = {
+static const ber_sequence AttributeTypeAndDistinguishedValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_x509if_ATADV_attribute_id },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_hf_x509if_ATADV_attribute_value },
   /*XXX  missing stuff here */
@@ -139,10 +128,8 @@ dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag, tvbuff_
 
 /*--- Included file: packet-x509if-fn.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509if-fn.c                                                         */
-/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/*--- Fields for imported types ---*/
+
 
 
 static int
@@ -165,7 +152,7 @@ static int dissect_RelativeDistinguishedName_item(packet_info *pinfo, proto_tree
   return dissect_x509if_AttributeTypeAndDistinguishedValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_RelativeDistinguishedName_item);
 }
 
-static ber_sequence RelativeDistinguishedName_set_of[1] = {
+static const ber_sequence RelativeDistinguishedName_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item },
 };
 
@@ -180,7 +167,7 @@ static int dissect_RDNSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_x509if_RelativeDistinguishedName(FALSE, tvb, offset, pinfo, tree, hf_x509if_RDNSequence_item);
 }
 
-static ber_sequence RDNSequence_sequence_of[1] = {
+static const ber_sequence RDNSequence_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item },
 };
 
@@ -201,7 +188,7 @@ const value_string Name_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice Name_choice[] = {
+static const ber_choice Name_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rdnSequence },
   { 0, 0, 0, 0, NULL }
 };
@@ -238,7 +225,7 @@ dissect_x509if_ObjectClassKind(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
   return offset;
 }
 
-static asn_namedbit AllowedSubset_bits[] = {
+static const asn_namedbit AllowedSubset_bits[] = {
   {  0, &hf_x509if_AllowedSubset_baseObject, -1, -1, NULL, NULL },
   {  1, &hf_x509if_AllowedSubset_oneLevel, -1, -1, NULL, NULL },
   {  2, &hf_x509if_AllowedSubset_wholeSubtree, -1, -1, NULL, NULL },
@@ -287,21 +274,16 @@ void proto_register_x509if(void) {
 
 /*--- Included file: packet-x509if-hfarr.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509if-hfarr.c                                                      */
-/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
-
     { &hf_x509if_rdnSequence,
       { "rdnSequence", "x509if.rdnSequence",
         FT_UINT32, BASE_DEC, NULL, 0,
         "Name/rdnSequence", HFILL }},
     { &hf_x509if_RDNSequence_item,
-      { "Item[##]", "x509if.RDNSequence_item",
+      { "Item", "x509if.RDNSequence_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "RDNSequence/_item", HFILL }},
     { &hf_x509if_RelativeDistinguishedName_item,
-      { "Item(##)", "x509if.RelativeDistinguishedName_item",
+      { "Item", "x509if.RelativeDistinguishedName_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "RelativeDistinguishedName/_item", HFILL }},
     { &hf_x509if_AllowedSubset_baseObject,
@@ -327,11 +309,6 @@ void proto_register_x509if(void) {
 
 /*--- Included file: packet-x509if-ettarr.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509if-ettarr.c                                                     */
-/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
-
     &ett_x509if_Name,
     &ett_x509if_RDNSequence,
     &ett_x509if_RelativeDistinguishedName,
diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h
index d1026b9bab..ee50a56c47 100644
--- a/epan/dissectors/packet-x509if.h
+++ b/epan/dissectors/packet-x509if.h
@@ -1,15 +1,14 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509if.h                                                            */
+/* ./packet-x509if.h                                                          */
 /* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
 
 /* Input file: packet-x509if-template.h */
-/* Include files: packet-x509if-exp.h, packet-x509if-valexp.h */
 
 /* packet-x509if.h
  * Routines for X.509 Information Framework packet dissection
  *
- * $Id: packet-x509if-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
+ * $Id: packet-x509if-template.h 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -36,11 +35,6 @@
 
 /*--- Included file: packet-x509if-exp.h ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509if-exp.h                                                        */
-/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
-
 extern const value_string Name_vals[];
 int dissect_x509if_AttributeType(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_x509if_Name(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index 09c3660940..852278382c 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -1,15 +1,14 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509sat.c                                                           */
+/* ./packet-x509sat.c                                                         */
 /* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
 
 /* Input file: packet-x509sat-template.c */
-/* Include files: packet-x509sat-hf.c, packet-x509sat-ett.c, packet-x509sat-fn.c, packet-x509sat-hfarr.c, packet-x509sat-ettarr.c, packet-x509sat-val.h */
 
 /* packet-x509sat.c
  * Routines for X.509 Selected Attribute Types packet dissection
  *
- * $Id: packet-x509sat-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
+ * $Id: packet-x509sat-template.c 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -89,11 +88,6 @@ int hf_x509sat_id_at_collectiveTelephoneNumber = -1;
 
 /*--- Included file: packet-x509sat-hf.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509sat-hf.c                                                        */
-/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
-
 static int hf_x509sat_equality = -1;              /* AttributeType */
 static int hf_x509sat_substrings = -1;            /* AttributeType */
 static int hf_x509sat_greaterOrEqual = -1;        /* AttributeType */
@@ -111,11 +105,6 @@ static gint ett_x509sat_DirectoryString = -1;
 
 /*--- Included file: packet-x509sat-ett.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509sat-ett.c                                                       */
-/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
-
 static gint ett_x509sat_CriteriaItem = -1;
 static gint ett_x509sat_TelexNumber = -1;
 
@@ -125,11 +114,6 @@ static gint ett_x509sat_TelexNumber = -1;
 
 /*--- Included file: packet-x509sat-fn.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509sat-fn.c                                                        */
-/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
-
 /*--- Fields for imported types ---*/
 
 static int dissect_equality(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -178,7 +162,7 @@ static const value_string CriteriaItem_vals[] = {
   { 0, NULL }
 };
 
-static ber_choice CriteriaItem_choice[] = {
+static const ber_choice CriteriaItem_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_equality },
   {   1, BER_CLASS_CON, 1, 0, dissect_substrings },
   {   2, BER_CLASS_CON, 2, 0, dissect_greaterOrEqual },
@@ -224,7 +208,7 @@ static int dissect_answerback(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
   return dissect_x509sat_PrintableString(FALSE, tvb, offset, pinfo, tree, hf_x509sat_answerback);
 }
 
-static ber_sequence TelexNumber_sequence[] = {
+static const ber_sequence TelexNumber_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telexNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_countryCode },
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_answerback },
@@ -655,11 +639,6 @@ void proto_register_x509sat(void) {
 
 /*--- Included file: packet-x509sat-hfarr.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509sat-hfarr.c                                                     */
-/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
-
     { &hf_x509sat_equality,
       { "equality", "x509sat.equality",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -703,11 +682,6 @@ void proto_register_x509sat(void) {
 
 /*--- Included file: packet-x509sat-ettarr.c ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509sat-ettarr.c                                                    */
-/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
-
     &ett_x509sat_CriteriaItem,
     &ett_x509sat_TelexNumber,
 
diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h
index 20d107e2a9..fcea0d8112 100644
--- a/epan/dissectors/packet-x509sat.h
+++ b/epan/dissectors/packet-x509sat.h
@@ -1,15 +1,14 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509sat.h                                                           */
+/* ./packet-x509sat.h                                                         */
 /* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
 
 /* Input file: packet-x509sat-template.h */
-/* Include files: packet-x509sat-exp.h, packet-x509sat-valexp.h */
 
 /* packet-x509sat.h
  * Routines for X.509 Selected Attribute Types packet dissection
  *
- * $Id: packet-x509sat-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
+ * $Id: packet-x509sat-template.h 12203 2004-10-05 09:18:55Z guy $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -36,11 +35,6 @@
 
 /*--- Included file: packet-x509sat-exp.h ---*/
 
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* packet-x509sat-exp.h                                                       */
-/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
-
 int dissect_x509sat_UniqueIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-x509sat-exp.h ---*/