diff options
author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-07-03 07:03:57 +0000 |
---|---|---|
committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-07-03 07:03:57 +0000 |
commit | 16654e4e89fa7d3d2394e6ce0c494f531c7ff1b8 (patch) | |
tree | 538e8d1a3a712692153e340587d312ed2a43feda /epan/dissectors/packet-h235.c | |
parent | 896b2b006e27f586a529df66ce631e8c2d294103 (diff) |
remove name field from per_sequence_t structure, it can be retrieved from field information
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18637 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-h235.c')
-rw-r--r-- | epan/dissectors/packet-h235.c | 246 |
1 files changed, 123 insertions, 123 deletions
diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index f95c202fef..6a47cabf5b 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -299,9 +299,9 @@ dissect_h235_OCTET_STRING(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_ static const per_sequence_t NonStandardParameter_sequence[] = { - { "nonStandardIdentifier" , &hf_h235_nonStandardIdentifier, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, - { "data" , &hf_h235_data , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_nonStandardIdentifier, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_data , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING }, + { NULL, 0, 0, NULL } }; static int @@ -324,10 +324,10 @@ dissect_h235_BIT_STRING_SIZE_0_2048(tvbuff_t *tvb, int offset, asn_ctx_t *actx _ static const per_sequence_t DHset_sequence[] = { - { "halfkey" , &hf_h235_halfkey , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_2048 }, - { "modSize" , &hf_h235_modSize , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_2048 }, - { "generator" , &hf_h235_generator , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_2048 }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_halfkey , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_2048 }, + { &hf_h235_modSize , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_2048 }, + { &hf_h235_generator , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_2048 }, + { NULL, 0, 0, NULL } }; static int @@ -350,9 +350,9 @@ dissect_h235_BIT_STRING_SIZE_0_511(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U static const per_sequence_t ECpoint_sequence[] = { - { "x" , &hf_h235_x , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_BIT_STRING_SIZE_0_511 }, - { "y" , &hf_h235_y , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_BIT_STRING_SIZE_0_511 }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_x , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_BIT_STRING_SIZE_0_511 }, + { &hf_h235_y , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_BIT_STRING_SIZE_0_511 }, + { NULL, 0, 0, NULL } }; static int @@ -365,12 +365,12 @@ dissect_h235_ECpoint(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree static const per_sequence_t T_eckasdhp_sequence[] = { - { "public-key" , &hf_h235_public_key , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ECpoint }, - { "modulus" , &hf_h235_modulus , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, - { "base" , &hf_h235_base , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ECpoint }, - { "weierstrassA" , &hf_h235_weierstrassA , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, - { "weierstrassB" , &hf_h235_weierstrassB , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_public_key , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ECpoint }, + { &hf_h235_modulus , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, + { &hf_h235_base , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ECpoint }, + { &hf_h235_weierstrassA , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, + { &hf_h235_weierstrassB , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, + { NULL, 0, 0, NULL } }; static int @@ -383,12 +383,12 @@ dissect_h235_T_eckasdhp(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tr static const per_sequence_t T_eckasdh2_sequence[] = { - { "public-key" , &hf_h235_public_key , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ECpoint }, - { "fieldSize" , &hf_h235_fieldSize , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, - { "base" , &hf_h235_base , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ECpoint }, - { "weierstrassA" , &hf_h235_weierstrassA , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, - { "weierstrassB" , &hf_h235_weierstrassB , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_public_key , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ECpoint }, + { &hf_h235_fieldSize , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, + { &hf_h235_base , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ECpoint }, + { &hf_h235_weierstrassA , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, + { &hf_h235_weierstrassB , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING_SIZE_0_511 }, + { NULL, 0, 0, NULL } }; static int @@ -423,9 +423,9 @@ dissect_h235_ECKASDH(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree static const per_sequence_t TypedCertificate_sequence[] = { - { "type" , &hf_h235_type , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, - { "certificate" , &hf_h235_certificatedata, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_type , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_certificatedata, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING }, + { NULL, 0, 0, NULL } }; static int @@ -534,12 +534,12 @@ dissect_h235_IV16(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tr static const per_sequence_t Params_sequence[] = { - { "ranInt" , &hf_h235_ranInt , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_INTEGER }, - { "iv8" , &hf_h235_iv8 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_IV8 }, - { "iv16" , &hf_h235_iv16 , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_IV16 }, - { "iv" , &hf_h235_iv , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, - { "clearSalt" , &hf_h235_clearSalt , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_ranInt , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_INTEGER }, + { &hf_h235_iv8 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_IV8 }, + { &hf_h235_iv16 , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_IV16 }, + { &hf_h235_iv , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, + { &hf_h235_clearSalt , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, + { NULL, 0, 0, NULL } }; static int @@ -552,10 +552,10 @@ dissect_h235_Params(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree * static const per_sequence_t ENCRYPTEDxxx_sequence[] = { - { "algorithmOID" , &hf_h235_algorithmOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, - { "paramS" , &hf_h235_paramS , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Params }, - { "encryptedData" , &hf_h235_encryptedData , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_algorithmOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_paramS , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Params }, + { &hf_h235_encryptedData , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING }, + { NULL, 0, 0, NULL } }; int @@ -581,11 +581,11 @@ dissect_h235_BIT_STRING(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tr static const per_sequence_t SIGNEDxxx_sequence[] = { - { "toBeSigned" , &hf_h235_toBeSigned , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_xxx_ToBeSigned }, - { "algorithmOID" , &hf_h235_algorithmOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, - { "paramS" , &hf_h235_paramS , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Params }, - { "signature" , &hf_h235_signaturedata , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_toBeSigned , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_xxx_ToBeSigned }, + { &hf_h235_algorithmOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_paramS , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Params }, + { &hf_h235_signaturedata , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING }, + { NULL, 0, 0, NULL } }; int @@ -601,16 +601,16 @@ dissect_h235_SIGNEDxxx(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tre static const per_sequence_t V3KeySyncMaterial_sequence[] = { - { "generalID" , &hf_h235_generalID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Identifier }, - { "algorithmOID" , &hf_h235_algorithmOID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OBJECT_IDENTIFIER }, - { "paramS" , &hf_h235_paramS , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_Params }, - { "encryptedSessionKey" , &hf_h235_encryptedSessionKey, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, - { "encryptedSaltingKey" , &hf_h235_encryptedSaltingKey, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, - { "clearSaltingKey" , &hf_h235_clearSaltingKey, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, - { "paramSsalt" , &hf_h235_paramSsalt , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Params }, - { "keyDerivationOID" , &hf_h235_keyDerivationOID, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OBJECT_IDENTIFIER }, - { "genericKeyMaterial" , &hf_h235_genericKeyMaterial, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_generalID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Identifier }, + { &hf_h235_algorithmOID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_paramS , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_Params }, + { &hf_h235_encryptedSessionKey, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, + { &hf_h235_encryptedSaltingKey, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, + { &hf_h235_clearSaltingKey, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, + { &hf_h235_paramSsalt , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Params }, + { &hf_h235_keyDerivationOID, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_genericKeyMaterial, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_OCTET_STRING }, + { NULL, 0, 0, NULL } }; static int @@ -706,10 +706,10 @@ dissect_h235_Element(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree static const per_sequence_t ProfileElement_sequence[] = { - { "elementID" , &hf_h235_elementID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_INTEGER_0_255 }, - { "paramS" , &hf_h235_paramS , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Params }, - { "element" , &hf_h235_element , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Element }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_elementID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_INTEGER_0_255 }, + { &hf_h235_paramS , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Params }, + { &hf_h235_element , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Element }, + { NULL, 0, 0, NULL } }; static int @@ -722,7 +722,7 @@ dissect_h235_ProfileElement(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, prot static const per_sequence_t SEQUENCE_OF_ProfileElement_sequence_of[1] = { - { "" , &hf_h235_profileInfo_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ProfileElement }, + { &hf_h235_profileInfo_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ProfileElement }, }; static int @@ -735,20 +735,20 @@ dissect_h235_SEQUENCE_OF_ProfileElement(tvbuff_t *tvb, int offset, asn_ctx_t *ac static const per_sequence_t ClearToken_sequence[] = { - { "tokenOID" , &hf_h235_tokenOID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, - { "timeStamp" , &hf_h235_timeStamp , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_TimeStamp }, - { "password" , &hf_h235_password , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Password }, - { "dhkey" , &hf_h235_dhkey , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_DHset }, - { "challenge" , &hf_h235_challenge , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_ChallengeString }, - { "random" , &hf_h235_random , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_RandomVal }, - { "certificate" , &hf_h235_certificate , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_TypedCertificate }, - { "generalID" , &hf_h235_generalID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Identifier }, - { "nonStandard" , &hf_h235_nonStandard , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_NonStandardParameter }, - { "eckasdhkey" , &hf_h235_eckasdhkey , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_ECKASDH }, - { "sendersID" , &hf_h235_sendersID , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_Identifier }, - { "h235Key" , &hf_h235_h235Key , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_H235Key }, - { "profileInfo" , &hf_h235_profileInfo , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_SEQUENCE_OF_ProfileElement }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_tokenOID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_timeStamp , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_TimeStamp }, + { &hf_h235_password , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Password }, + { &hf_h235_dhkey , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_DHset }, + { &hf_h235_challenge , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_ChallengeString }, + { &hf_h235_random , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_RandomVal }, + { &hf_h235_certificate , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_TypedCertificate }, + { &hf_h235_generalID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_Identifier }, + { &hf_h235_nonStandard , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_NonStandardParameter }, + { &hf_h235_eckasdhkey , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_ECKASDH }, + { &hf_h235_sendersID , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_Identifier }, + { &hf_h235_h235Key , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_H235Key }, + { &hf_h235_profileInfo , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h235_SEQUENCE_OF_ProfileElement }, + { NULL, 0, 0, NULL } }; int @@ -764,10 +764,10 @@ dissect_h235_ClearToken(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tr static const per_sequence_t HASHEDxxx_sequence[] = { - { "algorithmOID" , &hf_h235_algorithmOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, - { "paramS" , &hf_h235_paramS , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Params }, - { "hash" , &hf_h235_hash , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_algorithmOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_paramS , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Params }, + { &hf_h235_hash , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_BIT_STRING }, + { NULL, 0, 0, NULL } }; int @@ -810,9 +810,9 @@ dissect_h235_EncodedPwdCertToken(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, static const per_sequence_t T_cryptoEncryptedToken_sequence[] = { - { "tokenOID" , &hf_h235_tokenOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, - { "token" , &hf_h235_encryptedToken , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ENCRYPTEDxxx }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_tokenOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_encryptedToken , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ENCRYPTEDxxx }, + { NULL, 0, 0, NULL } }; static int @@ -825,9 +825,9 @@ dissect_h235_T_cryptoEncryptedToken(tvbuff_t *tvb, int offset, asn_ctx_t *actx _ static const per_sequence_t T_cryptoSignedToken_sequence[] = { - { "tokenOID" , &hf_h235_tokenOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, - { "token" , &hf_h235_signedToken , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_SIGNEDxxx }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_tokenOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_signedToken , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_SIGNEDxxx }, + { NULL, 0, 0, NULL } }; static int @@ -840,10 +840,10 @@ dissect_h235_T_cryptoSignedToken(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, static const per_sequence_t T_cryptoHashedToken_sequence[] = { - { "tokenOID" , &hf_h235_tokenOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, - { "hashedVals" , &hf_h235_hashedVals , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ClearToken }, - { "token" , &hf_h235_hashedToken , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_HASHEDxxx }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_tokenOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER }, + { &hf_h235_hashedVals , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ClearToken }, + { &hf_h235_hashedToken , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_HASHEDxxx }, + { NULL, 0, 0, NULL } }; static int @@ -885,12 +885,12 @@ dissect_h235_CryptoToken(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_t static const per_sequence_t KeySignedMaterial_sequence[] = { - { "generalId" , &hf_h235_generalId , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Identifier }, - { "mrandom" , &hf_h235_mrandom , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_RandomVal }, - { "srandom" , &hf_h235_srandom , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_h235_RandomVal }, - { "timeStamp" , &hf_h235_timeStamp , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_h235_TimeStamp }, - { "encrptval" , &hf_h235_encrptval , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ENCRYPTEDxxx }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_generalId , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Identifier }, + { &hf_h235_mrandom , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_RandomVal }, + { &hf_h235_srandom , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_h235_RandomVal }, + { &hf_h235_timeStamp , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_h235_TimeStamp }, + { &hf_h235_encrptval , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ENCRYPTEDxxx }, + { NULL, 0, 0, NULL } }; static int @@ -912,11 +912,11 @@ dissect_h235_EncodedKeySignedMaterial(tvbuff_t *tvb, int offset, asn_ctx_t *actx static const per_sequence_t ReturnSig_sequence[] = { - { "generalId" , &hf_h235_generalId , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Identifier }, - { "responseRandom" , &hf_h235_responseRandom , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_RandomVal }, - { "requestRandom" , &hf_h235_requestRandom , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_h235_RandomVal }, - { "certificate" , &hf_h235_certificate , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_h235_TypedCertificate }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_generalId , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Identifier }, + { &hf_h235_responseRandom , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_RandomVal }, + { &hf_h235_requestRandom , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_h235_RandomVal }, + { &hf_h235_certificate , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_h235_TypedCertificate }, + { NULL, 0, 0, NULL } }; static int @@ -938,9 +938,9 @@ dissect_h235_EncodedReturnSig(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, pr static const per_sequence_t KeySyncMaterial_sequence[] = { - { "generalID" , &hf_h235_generalID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_Identifier }, - { "keyMaterial" , &hf_h235_keyMaterial , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_KeyMaterial }, - { NULL, NULL, 0, 0, NULL } + { &hf_h235_generalID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_Identifier }, + { &hf_h235_keyMaterial , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_KeyMaterial }, + { NULL, 0, 0, NULL } }; static int @@ -972,9 +972,9 @@ dissect_h235_INTEGER_0_24(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_ static const per_sequence_t FecOrder_sequence[] = { - { "fecBeforeSrtp" , &hf_h235_fecBeforeSrtp , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_NULL }, - { "fecAfterSrtp" , &hf_h235_fecAfterSrtp , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_NULL }, - { NULL, NULL, 0, 0, NULL } + { &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 @@ -997,7 +997,7 @@ dissect_h235_INTEGER_64_65535(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, pr static const per_sequence_t SEQUENCE_OF_GenericData_sequence_of[1] = { - { "" , &hf_h235_newParameter_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h225_GenericData }, + { &hf_h235_newParameter_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h225_GenericData }, }; static int @@ -1010,14 +1010,14 @@ dissect_h235_SEQUENCE_OF_GenericData(tvbuff_t *tvb, int offset, asn_ctx_t *actx static const per_sequence_t SrtpSessionParameters_sequence[] = { - { "kdr" , &hf_h235_kdr , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_INTEGER_0_24 }, - { "unencryptedSrtp" , &hf_h235_unencryptedSrtp, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_BOOLEAN }, - { "unencryptedSrtcp" , &hf_h235_unencryptedSrtcp, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_BOOLEAN }, - { "unauthenticatedSrtp" , &hf_h235_unauthenticatedSrtp, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_BOOLEAN }, - { "fecOrder" , &hf_h235_fecOrder , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_FecOrder }, - { "windowSizeHint" , &hf_h235_windowSizeHint , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_INTEGER_64_65535 }, - { "newParameter" , &hf_h235_newParameter , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_SEQUENCE_OF_GenericData }, - { NULL, NULL, 0, 0, NULL } + { &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 @@ -1030,10 +1030,10 @@ dissect_h235_SrtpSessionParameters(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U static const per_sequence_t SrtpCryptoInfo_sequence[] = { - { "cryptoSuite" , &hf_h235_cryptoSuite , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_OBJECT_IDENTIFIER }, - { "sessionParams" , &hf_h235_sessionParams , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_SrtpSessionParameters }, - { "allowMKI" , &hf_h235_allowMKI , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_BOOLEAN }, - { NULL, NULL, 0, 0, NULL } + { &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 @@ -1046,7 +1046,7 @@ dissect_h235_SrtpCryptoInfo(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, prot static const per_sequence_t SrtpCryptoCapability_sequence_of[1] = { - { "" , &hf_h235_SrtpCryptoCapability_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_SrtpCryptoInfo }, + { &hf_h235_SrtpCryptoCapability_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_SrtpCryptoInfo }, }; int @@ -1091,9 +1091,9 @@ dissect_h235_INTEGER_1_128(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto static const per_sequence_t T_mki_sequence[] = { - { "length" , &hf_h235_length , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_INTEGER_1_128 }, - { "value" , &hf_h235_value , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING }, - { NULL, NULL, 0, 0, NULL } + { &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 @@ -1106,11 +1106,11 @@ dissect_h235_T_mki(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *t static const per_sequence_t SrtpKeyParameters_sequence[] = { - { "masterKey" , &hf_h235_masterKey , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING }, - { "masterSalt" , &hf_h235_masterSalt , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_OCTET_STRING }, - { "lifetime" , &hf_h235_lifetime , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_T_lifetime }, - { "mki" , &hf_h235_mki , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h235_T_mki }, - { NULL, NULL, 0, 0, NULL } + { &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 @@ -1123,7 +1123,7 @@ dissect_h235_SrtpKeyParameters(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, p static const per_sequence_t SrtpKeys_sequence_of[1] = { - { "" , &hf_h235_SrtpKeys_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_SrtpKeyParameters }, + { &hf_h235_SrtpKeys_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_SrtpKeyParameters }, }; int |