change the signature that asn2wrs generates for functions to marm all parameters as _U_

to reduce the number of compiler warnings.

update some template and cnf files to use _U_ as well 



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

1 files changed, 52 insertions, 359 deletions

diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index 205b2e01bf..7cc2320e1b 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-h235.c                                                            */
-/* ../../tools/asn2wrs.py -e -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn H235-SRTP.asn */
+/* ./packet-h235.c                                                            */
+/* ../../tools/asn2wrs.py -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
 
 /* Input file: packet-h235-template.c */
 
@@ -140,29 +140,6 @@ static int hf_h235_clearSaltingKey = -1;          /* OCTET_STRING */
 static int hf_h235_paramSsalt = -1;               /* Params */
 static int hf_h235_keyDerivationOID = -1;         /* OBJECT_IDENTIFIER */
 static int hf_h235_genericKeyMaterial = -1;       /* OCTET_STRING */
-static int hf_h235_SrtpCryptoCapability_item = -1;  /* SrtpCryptoInfo */
-static int hf_h235_cryptoSuite = -1;              /* OBJECT_IDENTIFIER */
-static int hf_h235_sessionParams = -1;            /* SrtpSessionParameters */
-static int hf_h235_allowMKI = -1;                 /* BOOLEAN */
-static int hf_h235_SrtpKeys_item = -1;            /* SrtpKeyParameters */
-static int hf_h235_masterKey = -1;                /* OCTET_STRING */
-static int hf_h235_masterSalt = -1;               /* OCTET_STRING */
-static int hf_h235_lifetime = -1;                 /* T_lifetime */
-static int hf_h235_powerOfTwo = -1;               /* INTEGER */
-static int hf_h235_specific = -1;                 /* INTEGER */
-static int hf_h235_mki = -1;                      /* T_mki */
-static int hf_h235_length = -1;                   /* INTEGER_1_128 */
-static int hf_h235_value = -1;                    /* OCTET_STRING */
-static int hf_h235_kdr = -1;                      /* INTEGER_0_24 */
-static int hf_h235_unencryptedSrtp = -1;          /* BOOLEAN */
-static int hf_h235_unencryptedSrtcp = -1;         /* BOOLEAN */
-static int hf_h235_unauthenticatedSrtp = -1;      /* BOOLEAN */
-static int hf_h235_fecOrder = -1;                 /* FecOrder */
-static int hf_h235_windowSizeHint = -1;           /* INTEGER_64_65535 */
-static int hf_h235_newParameter = -1;             /* SEQUENCE_OF_GenericData */
-static int hf_h235_newParameter_item = -1;        /* GenericData */
-static int hf_h235_fecBeforeSrtp = -1;            /* NULL */
-static int hf_h235_fecAfterSrtp = -1;             /* NULL */
 
 /*--- End of included file: packet-h235-hf.c ---*/
 #line 49 "packet-h235-template.c"
@@ -197,15 +174,6 @@ static gint ett_h235_KeySignedMaterial = -1;
 static gint ett_h235_ReturnSig = -1;
 static gint ett_h235_KeySyncMaterial = -1;
 static gint ett_h235_V3KeySyncMaterial = -1;
-static gint ett_h235_SrtpCryptoCapability = -1;
-static gint ett_h235_SrtpCryptoInfo = -1;
-static gint ett_h235_SrtpKeys = -1;
-static gint ett_h235_SrtpKeyParameters = -1;
-static gint ett_h235_T_lifetime = -1;
-static gint ett_h235_T_mki = -1;
-static gint ett_h235_SrtpSessionParameters = -1;
-static gint ett_h235_SEQUENCE_OF_GenericData = -1;
-static gint ett_h235_FecOrder = -1;
 
 /*--- End of included file: packet-h235-ett.c ---*/
 #line 52 "packet-h235-template.c"
@@ -222,7 +190,7 @@ PER_NOT_DECODED_YET("ToBeSigned");
 
 
 static int
-dissect_h235_ChallengeString(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_ChallengeString(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        8, 128, NULL);
 
@@ -232,7 +200,7 @@ dissect_h235_ChallengeString(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, pr
 
 
 int
-dissect_h235_TimeStamp(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_TimeStamp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                               1U, 4294967295U, NULL, FALSE);
 
@@ -242,7 +210,7 @@ dissect_h235_TimeStamp(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tr
 
 
 static int
-dissect_h235_RandomVal(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_RandomVal(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL);
 
   return offset;
@@ -251,7 +219,7 @@ dissect_h235_RandomVal(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tr
 
 
 static int
-dissect_h235_Password(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_Password(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_BMPString(tvb, offset, actx, tree, hf_index,
                                           1, 128);
 
@@ -261,7 +229,7 @@ dissect_h235_Password(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tre
 
 
 static int
-dissect_h235_Identifier(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_Identifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_BMPString(tvb, offset, actx, tree, hf_index,
                                           1, 128);
 
@@ -271,7 +239,7 @@ dissect_h235_Identifier(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_t
 
 
 static int
-dissect_h235_KeyMaterial(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_KeyMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
                                      1, 2048, FALSE, NULL);
 
@@ -281,7 +249,7 @@ dissect_h235_KeyMaterial(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_
 
 
 static int
-dissect_h235_OBJECT_IDENTIFIER(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_OBJECT_IDENTIFIER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_object_identifier(tvb, offset, actx, tree, hf_index, NULL);
 
   return offset;
@@ -290,7 +258,7 @@ dissect_h235_OBJECT_IDENTIFIER(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_,
 
 
 static int
-dissect_h235_OCTET_STRING(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_OCTET_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        NO_BOUND, NO_BOUND, NULL);
 
@@ -305,7 +273,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = {
 };
 
 static int
-dissect_h235_NonStandardParameter(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_NonStandardParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_NonStandardParameter, NonStandardParameter_sequence);
 
@@ -315,7 +283,7 @@ dissect_h235_NonStandardParameter(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U
 
 
 static int
-dissect_h235_BIT_STRING_SIZE_0_2048(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_BIT_STRING_SIZE_0_2048(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
                                      0, 2048, FALSE, NULL);
 
@@ -331,7 +299,7 @@ static const per_sequence_t DHset_sequence[] = {
 };
 
 static int
-dissect_h235_DHset(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_DHset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_DHset, DHset_sequence);
 
@@ -341,7 +309,7 @@ dissect_h235_DHset(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *
 
 
 static int
-dissect_h235_BIT_STRING_SIZE_0_511(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_BIT_STRING_SIZE_0_511(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
                                      0, 511, FALSE, NULL);
 
@@ -356,7 +324,7 @@ static const per_sequence_t ECpoint_sequence[] = {
 };
 
 static int
-dissect_h235_ECpoint(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_ECpoint(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_ECpoint, ECpoint_sequence);
 
@@ -374,7 +342,7 @@ static const per_sequence_t T_eckasdhp_sequence[] = {
 };
 
 static int
-dissect_h235_T_eckasdhp(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_T_eckasdhp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_T_eckasdhp, T_eckasdhp_sequence);
 
@@ -392,7 +360,7 @@ static const per_sequence_t T_eckasdh2_sequence[] = {
 };
 
 static int
-dissect_h235_T_eckasdh2(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_T_eckasdh2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_T_eckasdh2, T_eckasdh2_sequence);
 
@@ -413,7 +381,7 @@ static const per_choice_t ECKASDH_choice[] = {
 };
 
 static int
-dissect_h235_ECKASDH(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_ECKASDH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_h235_ECKASDH, ECKASDH_choice,
                                  NULL);
@@ -429,7 +397,7 @@ static const per_sequence_t TypedCertificate_sequence[] = {
 };
 
 static int
-dissect_h235_TypedCertificate(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_TypedCertificate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_TypedCertificate, TypedCertificate_sequence);
 
@@ -439,7 +407,7 @@ dissect_h235_TypedCertificate(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, p
 
 
 static int
-dissect_h235_NULL(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_NULL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_null(tvb, offset, actx, tree, hf_index);
 
   return offset;
@@ -459,7 +427,7 @@ static const per_choice_t AuthenticationBES_choice[] = {
 };
 
 static int
-dissect_h235_AuthenticationBES(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_AuthenticationBES(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_h235_AuthenticationBES, AuthenticationBES_choice,
                                  NULL);
@@ -495,7 +463,7 @@ static const per_choice_t AuthenticationMechanism_choice[] = {
 };
 
 int
-dissect_h235_AuthenticationMechanism(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_AuthenticationMechanism(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_h235_AuthenticationMechanism, AuthenticationMechanism_choice,
                                  NULL);
@@ -506,7 +474,7 @@ dissect_h235_AuthenticationMechanism(tvbuff_t *tvb, int offset, asn1_ctx_t *actx
 
 
 static int
-dissect_h235_INTEGER(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_INTEGER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL);
 
   return offset;
@@ -515,7 +483,7 @@ dissect_h235_INTEGER(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree
 
 
 static int
-dissect_h235_IV8(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_IV8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        8, 8, NULL);
 
@@ -525,7 +493,7 @@ dissect_h235_IV8(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tr
 
 
 static int
-dissect_h235_IV16(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_IV16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        16, 16, NULL);
 
@@ -543,7 +511,7 @@ static const per_sequence_t Params_sequence[] = {
 };
 
 static int
-dissect_h235_Params(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_Params(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_Params, Params_sequence);
 
@@ -559,7 +527,7 @@ static const per_sequence_t ENCRYPTEDxxx_sequence[] = {
 };
 
 int
-dissect_h235_ENCRYPTEDxxx(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_ENCRYPTEDxxx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 49 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
 
@@ -572,7 +540,7 @@ dissect_h235_ENCRYPTEDxxx(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto
 
 
 static int
-dissect_h235_BIT_STRING(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_BIT_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
                                      NO_BOUND, NO_BOUND, FALSE, NULL);
 
@@ -589,7 +557,7 @@ static const per_sequence_t SIGNEDxxx_sequence[] = {
 };
 
 int
-dissect_h235_SIGNEDxxx(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_SIGNEDxxx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 46 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
 
@@ -614,7 +582,7 @@ static const per_sequence_t V3KeySyncMaterial_sequence[] = {
 };
 
 static int
-dissect_h235_V3KeySyncMaterial(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_V3KeySyncMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_V3KeySyncMaterial, V3KeySyncMaterial_sequence);
 
@@ -639,7 +607,7 @@ static const per_choice_t H235Key_choice[] = {
 };
 
 static int
-dissect_h235_H235Key(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_H235Key(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_h235_H235Key, H235Key_choice,
                                  NULL);
@@ -650,7 +618,7 @@ dissect_h235_H235Key(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree
 
 
 static int
-dissect_h235_INTEGER_0_255(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_INTEGER_0_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                               0U, 255U, NULL, FALSE);
 
@@ -660,7 +628,7 @@ dissect_h235_INTEGER_0_255(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, prot
 
 
 static int
-dissect_h235_BMPString(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_BMPString(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_BMPString(tvb, offset, actx, tree, hf_index,
                                           NO_BOUND, NO_BOUND);
 
@@ -670,7 +638,7 @@ dissect_h235_BMPString(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tr
 
 
 static int
-dissect_h235_BOOLEAN(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_BOOLEAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_boolean(tvb, offset, actx, tree, hf_index, NULL);
 
   return offset;
@@ -696,7 +664,7 @@ static const per_choice_t Element_choice[] = {
 };
 
 static int
-dissect_h235_Element(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_Element(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_h235_Element, Element_choice,
                                  NULL);
@@ -713,7 +681,7 @@ static const per_sequence_t ProfileElement_sequence[] = {
 };
 
 static int
-dissect_h235_ProfileElement(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_ProfileElement(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_ProfileElement, ProfileElement_sequence);
 
@@ -726,7 +694,7 @@ static const per_sequence_t SEQUENCE_OF_ProfileElement_sequence_of[1] = {
 };
 
 static int
-dissect_h235_SEQUENCE_OF_ProfileElement(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_SEQUENCE_OF_ProfileElement(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index,
                                       ett_h235_SEQUENCE_OF_ProfileElement, SEQUENCE_OF_ProfileElement_sequence_of);
 
@@ -752,7 +720,7 @@ static const per_sequence_t ClearToken_sequence[] = {
 };
 
 int
-dissect_h235_ClearToken(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_ClearToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 56 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
 
@@ -771,7 +739,7 @@ static const per_sequence_t HASHEDxxx_sequence[] = {
 };
 
 int
-dissect_h235_HASHEDxxx(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_HASHEDxxx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 52 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
 
@@ -784,7 +752,7 @@ dissect_h235_HASHEDxxx(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tr
 
 
 static int
-dissect_h235_EncodedGeneralToken(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_EncodedGeneralToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_ClearToken);
 
   return offset;
@@ -793,7 +761,7 @@ dissect_h235_EncodedGeneralToken(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_
 
 
 static int
-dissect_h235_PwdCertToken(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_PwdCertToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_h235_ClearToken(tvb, offset, actx, tree, hf_index);
 
   return offset;
@@ -802,7 +770,7 @@ dissect_h235_PwdCertToken(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto
 
 
 static int
-dissect_h235_EncodedPwdCertToken(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_EncodedPwdCertToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_PwdCertToken);
 
   return offset;
@@ -816,7 +784,7 @@ static const per_sequence_t T_cryptoEncryptedToken_sequence[] = {
 };
 
 static int
-dissect_h235_T_cryptoEncryptedToken(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_T_cryptoEncryptedToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_T_cryptoEncryptedToken, T_cryptoEncryptedToken_sequence);
 
@@ -831,7 +799,7 @@ static const per_sequence_t T_cryptoSignedToken_sequence[] = {
 };
 
 static int
-dissect_h235_T_cryptoSignedToken(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_T_cryptoSignedToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_T_cryptoSignedToken, T_cryptoSignedToken_sequence);
 
@@ -847,7 +815,7 @@ static const per_sequence_t T_cryptoHashedToken_sequence[] = {
 };
 
 static int
-dissect_h235_T_cryptoHashedToken(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_T_cryptoHashedToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_T_cryptoHashedToken, T_cryptoHashedToken_sequence);
 
@@ -872,7 +840,7 @@ static const per_choice_t CryptoToken_choice[] = {
 };
 
 int
-dissect_h235_CryptoToken(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 60 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
 
@@ -894,7 +862,7 @@ static const per_sequence_t KeySignedMaterial_sequence[] = {
 };
 
 static int
-dissect_h235_KeySignedMaterial(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_KeySignedMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_KeySignedMaterial, KeySignedMaterial_sequence);
 
@@ -904,7 +872,7 @@ dissect_h235_KeySignedMaterial(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_,
 
 
 static int
-dissect_h235_EncodedKeySignedMaterial(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_EncodedKeySignedMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_KeySignedMaterial);
 
   return offset;
@@ -920,7 +888,7 @@ static const per_sequence_t ReturnSig_sequence[] = {
 };
 
 static int
-dissect_h235_ReturnSig(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_ReturnSig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_ReturnSig, ReturnSig_sequence);
 
@@ -930,7 +898,7 @@ dissect_h235_ReturnSig(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tr
 
 
 static int
-dissect_h235_EncodedReturnSig(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_EncodedReturnSig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_ReturnSig);
 
   return offset;
@@ -944,7 +912,7 @@ static const per_sequence_t KeySyncMaterial_sequence[] = {
 };
 
 static int
-dissect_h235_KeySyncMaterial(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_KeySyncMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h235_KeySyncMaterial, KeySyncMaterial_sequence);
 
@@ -954,187 +922,13 @@ dissect_h235_KeySyncMaterial(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, pr
 
 
 static int
-dissect_h235_EncodedKeySyncMaterial(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_h235_EncodedKeySyncMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_KeySyncMaterial);
 
   return offset;
 }
 
 
-
-static int
-dissect_h235_INTEGER_0_24(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
-                                              0U, 24U, NULL, FALSE);
-
-  return offset;
-}
-
-
-static const per_sequence_t FecOrder_sequence[] = {
-  { &hf_h235_fecBeforeSrtp  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_NULL },
-  { &hf_h235_fecAfterSrtp   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_NULL },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_h235_FecOrder(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_h235_FecOrder, FecOrder_sequence);
-
-  return offset;
-}
-
-
-
-static int
-dissect_h235_INTEGER_64_65535(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
-                                              64U, 65535U, NULL, FALSE);
-
-  return offset;
-}
-
-
-static const per_sequence_t SEQUENCE_OF_GenericData_sequence_of[1] = {
-  { &hf_h235_newParameter_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_h225_GenericData },
-};
-
-static int
-dissect_h235_SEQUENCE_OF_GenericData(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index,
-                                      ett_h235_SEQUENCE_OF_GenericData, SEQUENCE_OF_GenericData_sequence_of);
-
-  return offset;
-}
-
-
-static const per_sequence_t SrtpSessionParameters_sequence[] = {
-  { &hf_h235_kdr            , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_INTEGER_0_24 },
-  { &hf_h235_unencryptedSrtp, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_BOOLEAN },
-  { &hf_h235_unencryptedSrtcp, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_BOOLEAN },
-  { &hf_h235_unauthenticatedSrtp, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_BOOLEAN },
-  { &hf_h235_fecOrder       , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_FecOrder },
-  { &hf_h235_windowSizeHint , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_INTEGER_64_65535 },
-  { &hf_h235_newParameter   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_SEQUENCE_OF_GenericData },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_h235_SrtpSessionParameters(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_h235_SrtpSessionParameters, SrtpSessionParameters_sequence);
-
-  return offset;
-}
-
-
-static const per_sequence_t SrtpCryptoInfo_sequence[] = {
-  { &hf_h235_cryptoSuite    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_OBJECT_IDENTIFIER },
-  { &hf_h235_sessionParams  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_SrtpSessionParameters },
-  { &hf_h235_allowMKI       , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_BOOLEAN },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_h235_SrtpCryptoInfo(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_h235_SrtpCryptoInfo, SrtpCryptoInfo_sequence);
-
-  return offset;
-}
-
-
-static const per_sequence_t SrtpCryptoCapability_sequence_of[1] = {
-  { &hf_h235_SrtpCryptoCapability_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_h235_SrtpCryptoInfo },
-};
-
-int
-dissect_h235_SrtpCryptoCapability(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index,
-                                      ett_h235_SrtpCryptoCapability, SrtpCryptoCapability_sequence_of);
-
-  return offset;
-}
-
-
-static const value_string h235_T_lifetime_vals[] = {
-  {   0, "powerOfTwo" },
-  {   1, "specific" },
-  { 0, NULL }
-};
-
-static const per_choice_t T_lifetime_choice[] = {
-  {   0, &hf_h235_powerOfTwo     , ASN1_EXTENSION_ROOT    , dissect_h235_INTEGER },
-  {   1, &hf_h235_specific       , ASN1_EXTENSION_ROOT    , dissect_h235_INTEGER },
-  { 0, NULL, 0, NULL }
-};
-
-static int
-dissect_h235_T_lifetime(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
-                                 ett_h235_T_lifetime, T_lifetime_choice,
-                                 NULL);
-
-  return offset;
-}
-
-
-
-static int
-dissect_h235_INTEGER_1_128(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
-                                              1U, 128U, NULL, FALSE);
-
-  return offset;
-}
-
-
-static const per_sequence_t T_mki_sequence[] = {
-  { &hf_h235_length         , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h235_INTEGER_1_128 },
-  { &hf_h235_value          , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_h235_T_mki(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_h235_T_mki, T_mki_sequence);
-
-  return offset;
-}
-
-
-static const per_sequence_t SrtpKeyParameters_sequence[] = {
-  { &hf_h235_masterKey      , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING },
-  { &hf_h235_masterSalt     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING },
-  { &hf_h235_lifetime       , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_T_lifetime },
-  { &hf_h235_mki            , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h235_T_mki },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_h235_SrtpKeyParameters(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_h235_SrtpKeyParameters, SrtpKeyParameters_sequence);
-
-  return offset;
-}
-
-
-static const per_sequence_t SrtpKeys_sequence_of[1] = {
-  { &hf_h235_SrtpKeys_item  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_h235_SrtpKeyParameters },
-};
-
-int
-dissect_h235_SrtpKeys(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index,
-                                      ett_h235_SrtpKeys, SrtpKeys_sequence_of);
-
-  return offset;
-}
-
-
 /*--- End of included file: packet-h235-fn.c ---*/
 #line 60 "packet-h235-template.c"
 
@@ -1483,98 +1277,6 @@ void proto_register_h235(void) {
       { "genericKeyMaterial", "h235.genericKeyMaterial",
         FT_BYTES, BASE_HEX, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
-    { &hf_h235_SrtpCryptoCapability_item,
-      { "Item", "h235.SrtpCryptoCapability_item",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h235.SrtpCryptoInfo", HFILL }},
-    { &hf_h235_cryptoSuite,
-      { "cryptoSuite", "h235.cryptoSuite",
-        FT_OID, BASE_NONE, NULL, 0,
-        "h235.OBJECT_IDENTIFIER", HFILL }},
-    { &hf_h235_sessionParams,
-      { "sessionParams", "h235.sessionParams",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h235.SrtpSessionParameters", HFILL }},
-    { &hf_h235_allowMKI,
-      { "allowMKI", "h235.allowMKI",
-        FT_BOOLEAN, 8, NULL, 0,
-        "h235.BOOLEAN", HFILL }},
-    { &hf_h235_SrtpKeys_item,
-      { "Item", "h235.SrtpKeys_item",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h235.SrtpKeyParameters", HFILL }},
-    { &hf_h235_masterKey,
-      { "masterKey", "h235.masterKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "h235.OCTET_STRING", HFILL }},
-    { &hf_h235_masterSalt,
-      { "masterSalt", "h235.masterSalt",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "h235.OCTET_STRING", HFILL }},
-    { &hf_h235_lifetime,
-      { "lifetime", "h235.lifetime",
-        FT_UINT32, BASE_DEC, VALS(h235_T_lifetime_vals), 0,
-        "h235.T_lifetime", HFILL }},
-    { &hf_h235_powerOfTwo,
-      { "powerOfTwo", "h235.powerOfTwo",
-        FT_INT32, BASE_DEC, NULL, 0,
-        "h235.INTEGER", HFILL }},
-    { &hf_h235_specific,
-      { "specific", "h235.specific",
-        FT_INT32, BASE_DEC, NULL, 0,
-        "h235.INTEGER", HFILL }},
-    { &hf_h235_mki,
-      { "mki", "h235.mki",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h235.T_mki", HFILL }},
-    { &hf_h235_length,
-      { "length", "h235.length",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        "h235.INTEGER_1_128", HFILL }},
-    { &hf_h235_value,
-      { "value", "h235.value",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "h235.OCTET_STRING", HFILL }},
-    { &hf_h235_kdr,
-      { "kdr", "h235.kdr",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        "h235.INTEGER_0_24", HFILL }},
-    { &hf_h235_unencryptedSrtp,
-      { "unencryptedSrtp", "h235.unencryptedSrtp",
-        FT_BOOLEAN, 8, NULL, 0,
-        "h235.BOOLEAN", HFILL }},
-    { &hf_h235_unencryptedSrtcp,
-      { "unencryptedSrtcp", "h235.unencryptedSrtcp",
-        FT_BOOLEAN, 8, NULL, 0,
-        "h235.BOOLEAN", HFILL }},
-    { &hf_h235_unauthenticatedSrtp,
-      { "unauthenticatedSrtp", "h235.unauthenticatedSrtp",
-        FT_BOOLEAN, 8, NULL, 0,
-        "h235.BOOLEAN", HFILL }},
-    { &hf_h235_fecOrder,
-      { "fecOrder", "h235.fecOrder",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h235.FecOrder", HFILL }},
-    { &hf_h235_windowSizeHint,
-      { "windowSizeHint", "h235.windowSizeHint",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        "h235.INTEGER_64_65535", HFILL }},
-    { &hf_h235_newParameter,
-      { "newParameter", "h235.newParameter",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        "h235.SEQUENCE_OF_GenericData", HFILL }},
-    { &hf_h235_newParameter_item,
-      { "Item", "h235.newParameter_item",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h225.GenericData", HFILL }},
-    { &hf_h235_fecBeforeSrtp,
-      { "fecBeforeSrtp", "h235.fecBeforeSrtp",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h235.NULL", HFILL }},
-    { &hf_h235_fecAfterSrtp,
-      { "fecAfterSrtp", "h235.fecAfterSrtp",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h235.NULL", HFILL }},
 
 /*--- End of included file: packet-h235-hfarr.c ---*/
 #line 68 "packet-h235-template.c"
@@ -1611,15 +1313,6 @@ void proto_register_h235(void) {
     &ett_h235_ReturnSig,
     &ett_h235_KeySyncMaterial,
     &ett_h235_V3KeySyncMaterial,
-    &ett_h235_SrtpCryptoCapability,
-    &ett_h235_SrtpCryptoInfo,
-    &ett_h235_SrtpKeys,
-    &ett_h235_SrtpKeyParameters,
-    &ett_h235_T_lifetime,
-    &ett_h235_T_mki,
-    &ett_h235_SrtpSessionParameters,
-    &ett_h235_SEQUENCE_OF_GenericData,
-    &ett_h235_FecOrder,
 
 /*--- End of included file: packet-h235-ettarr.c ---*/
 #line 73 "packet-h235-template.c"