diff options
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-h225.c | 38 | ||||
-rw-r--r-- | epan/dissectors/packet-h235.c | 72 | ||||
-rw-r--r-- | epan/dissectors/packet-h235.h | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-h450.c | 26 | ||||
-rw-r--r-- | epan/dissectors/packet-qsig.c | 2 |
5 files changed, 72 insertions, 72 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 181bd6a9f5..ed068bf058 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -502,14 +502,14 @@ static int hf_h225_icv = -1; /* BIT_STRING */ static int hf_h225_cryptoEPPwdHash = -1; /* T_cryptoEPPwdHash */ static int hf_h225_alias = -1; /* AliasAddress */ static int hf_h225_timeStamp = -1; /* TimeStamp */ -static int hf_h225_token = -1; /* HASHEDxxx */ +static int hf_h225_token = -1; /* HASHED */ static int hf_h225_cryptoGKPwdHash = -1; /* T_cryptoGKPwdHash */ static int hf_h225_gatekeeperId = -1; /* GatekeeperIdentifier */ -static int hf_h225_cryptoEPPwdEncr = -1; /* ENCRYPTEDxxx */ -static int hf_h225_cryptoGKPwdEncr = -1; /* ENCRYPTEDxxx */ -static int hf_h225_cryptoEPCert = -1; /* SIGNEDxxx */ -static int hf_h225_cryptoGKCert = -1; /* SIGNEDxxx */ -static int hf_h225_cryptoFastStart = -1; /* SIGNEDxxx */ +static int hf_h225_cryptoEPPwdEncr = -1; /* ENCRYPTED */ +static int hf_h225_cryptoGKPwdEncr = -1; /* ENCRYPTED */ +static int hf_h225_cryptoEPCert = -1; /* SIGNED */ +static int hf_h225_cryptoGKCert = -1; /* SIGNED */ +static int hf_h225_cryptoFastStart = -1; /* SIGNED */ static int hf_h225_nestedcryptoToken = -1; /* CryptoToken */ static int hf_h225_channelRate = -1; /* BandWidth */ static int hf_h225_channelMultiplier = -1; /* INTEGER_1_256 */ @@ -2951,7 +2951,7 @@ dissect_h225_SEQUENCE_OF_ClearToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static const per_sequence_t T_cryptoEPPwdHash_sequence[] = { { &hf_h225_alias , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h225_AliasAddress }, { &hf_h225_timeStamp , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_TimeStamp }, - { &hf_h225_token , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_HASHEDxxx }, + { &hf_h225_token , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_HASHED }, { NULL, 0, 0, NULL } }; @@ -2977,7 +2977,7 @@ dissect_h225_GatekeeperIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static const per_sequence_t T_cryptoGKPwdHash_sequence[] = { { &hf_h225_gatekeeperId , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h225_GatekeeperIdentifier }, { &hf_h225_timeStamp , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_TimeStamp }, - { &hf_h225_token , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_HASHEDxxx }, + { &hf_h225_token , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_HASHED }, { NULL, 0, 0, NULL } }; @@ -3005,11 +3005,11 @@ static const value_string h225_CryptoH323Token_vals[] = { static const per_choice_t CryptoH323Token_choice[] = { { 0, &hf_h225_cryptoEPPwdHash, ASN1_EXTENSION_ROOT , dissect_h225_T_cryptoEPPwdHash }, { 1, &hf_h225_cryptoGKPwdHash, ASN1_EXTENSION_ROOT , dissect_h225_T_cryptoGKPwdHash }, - { 2, &hf_h225_cryptoEPPwdEncr, ASN1_EXTENSION_ROOT , dissect_h235_ENCRYPTEDxxx }, - { 3, &hf_h225_cryptoGKPwdEncr, ASN1_EXTENSION_ROOT , dissect_h235_ENCRYPTEDxxx }, - { 4, &hf_h225_cryptoEPCert , ASN1_EXTENSION_ROOT , dissect_h235_SIGNEDxxx }, - { 5, &hf_h225_cryptoGKCert , ASN1_EXTENSION_ROOT , dissect_h235_SIGNEDxxx }, - { 6, &hf_h225_cryptoFastStart, ASN1_EXTENSION_ROOT , dissect_h235_SIGNEDxxx }, + { 2, &hf_h225_cryptoEPPwdEncr, ASN1_EXTENSION_ROOT , dissect_h235_ENCRYPTED }, + { 3, &hf_h225_cryptoGKPwdEncr, ASN1_EXTENSION_ROOT , dissect_h235_ENCRYPTED }, + { 4, &hf_h225_cryptoEPCert , ASN1_EXTENSION_ROOT , dissect_h235_SIGNED }, + { 5, &hf_h225_cryptoGKCert , ASN1_EXTENSION_ROOT , dissect_h235_SIGNED }, + { 6, &hf_h225_cryptoFastStart, ASN1_EXTENSION_ROOT , dissect_h235_SIGNED }, { 7, &hf_h225_nestedcryptoToken, ASN1_EXTENSION_ROOT , dissect_h235_CryptoToken }, { 0, NULL, 0, NULL } }; @@ -8971,7 +8971,7 @@ void proto_register_h225(void) { { &hf_h225_token, { "token", "h225.token", FT_NONE, BASE_NONE, NULL, 0, - "h235.HASHEDxxx", HFILL }}, + "h235.HASHED", HFILL }}, { &hf_h225_cryptoGKPwdHash, { "cryptoGKPwdHash", "h225.cryptoGKPwdHash", FT_NONE, BASE_NONE, NULL, 0, @@ -8983,23 +8983,23 @@ void proto_register_h225(void) { { &hf_h225_cryptoEPPwdEncr, { "cryptoEPPwdEncr", "h225.cryptoEPPwdEncr", FT_NONE, BASE_NONE, NULL, 0, - "h235.ENCRYPTEDxxx", HFILL }}, + "h235.ENCRYPTED", HFILL }}, { &hf_h225_cryptoGKPwdEncr, { "cryptoGKPwdEncr", "h225.cryptoGKPwdEncr", FT_NONE, BASE_NONE, NULL, 0, - "h235.ENCRYPTEDxxx", HFILL }}, + "h235.ENCRYPTED", HFILL }}, { &hf_h225_cryptoEPCert, { "cryptoEPCert", "h225.cryptoEPCert", FT_NONE, BASE_NONE, NULL, 0, - "h235.SIGNEDxxx", HFILL }}, + "h235.SIGNED", HFILL }}, { &hf_h225_cryptoGKCert, { "cryptoGKCert", "h225.cryptoGKCert", FT_NONE, BASE_NONE, NULL, 0, - "h235.SIGNEDxxx", HFILL }}, + "h235.SIGNED", HFILL }}, { &hf_h225_cryptoFastStart, { "cryptoFastStart", "h225.cryptoFastStart", FT_NONE, BASE_NONE, NULL, 0, - "h235.SIGNEDxxx", HFILL }}, + "h235.SIGNED", HFILL }}, { &hf_h225_nestedcryptoToken, { "nestedcryptoToken", "h225.nestedcryptoToken", FT_UINT32, BASE_DEC, VALS(h235_CryptoToken_vals), 0, diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index 6c81c7361c..ee792a3580 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -125,21 +125,21 @@ static int hf_h235_iv16 = -1; /* IV16 */ static int hf_h235_iv = -1; /* OCTET_STRING */ static int hf_h235_clearSalt = -1; /* OCTET_STRING */ static int hf_h235_cryptoEncryptedToken = -1; /* T_cryptoEncryptedToken */ -static int hf_h235_encryptedToken = -1; /* ENCRYPTEDxxx */ +static int hf_h235_encryptedToken = -1; /* ENCRYPTED */ static int hf_h235_cryptoSignedToken = -1; /* T_cryptoSignedToken */ -static int hf_h235_signedToken = -1; /* SIGNEDxxx */ +static int hf_h235_signedToken = -1; /* SIGNED */ static int hf_h235_cryptoHashedToken = -1; /* T_cryptoHashedToken */ static int hf_h235_hashedVals = -1; /* ClearToken */ -static int hf_h235_hashedToken = -1; /* HASHEDxxx */ -static int hf_h235_cryptoPwdEncr = -1; /* ENCRYPTEDxxx */ +static int hf_h235_hashedToken = -1; /* HASHED */ +static int hf_h235_cryptoPwdEncr = -1; /* ENCRYPTED */ static int hf_h235_secureChannel = -1; /* KeyMaterial */ -static int hf_h235_sharedSecret = -1; /* ENCRYPTEDxxx */ -static int hf_h235_certProtectedKey = -1; /* SIGNEDxxx */ +static int hf_h235_sharedSecret = -1; /* ENCRYPTED */ +static int hf_h235_certProtectedKey = -1; /* SIGNED */ static int hf_h235_secureSharedSecret = -1; /* V3KeySyncMaterial */ static int hf_h235_generalId = -1; /* Identifier */ static int hf_h235_mrandom = -1; /* RandomVal */ static int hf_h235_srandom = -1; /* RandomVal */ -static int hf_h235_encrptval = -1; /* ENCRYPTEDxxx */ +static int hf_h235_encrptval = -1; /* ENCRYPTED */ static int hf_h235_responseRandom = -1; /* RandomVal */ static int hf_h235_requestRandom = -1; /* RandomVal */ static int hf_h235_keyMaterial = -1; /* KeyMaterial */ @@ -193,9 +193,9 @@ static gint ett_h235_ClearToken = -1; static gint ett_h235_SEQUENCE_OF_ProfileElement = -1; static gint ett_h235_ProfileElement = -1; static gint ett_h235_Element = -1; -static gint ett_h235_SIGNEDxxx = -1; -static gint ett_h235_ENCRYPTEDxxx = -1; -static gint ett_h235_HASHEDxxx = -1; +static gint ett_h235_SIGNED = -1; +static gint ett_h235_ENCRYPTED = -1; +static gint ett_h235_HASHED = -1; static gint ett_h235_Params = -1; static gint ett_h235_CryptoToken = -1; static gint ett_h235_T_cryptoEncryptedToken = -1; @@ -562,7 +562,7 @@ dissect_h235_Params(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } -static const per_sequence_t ENCRYPTEDxxx_sequence[] = { +static const per_sequence_t ENCRYPTED_sequence[] = { { &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 }, @@ -570,12 +570,12 @@ static const per_sequence_t ENCRYPTEDxxx_sequence[] = { }; int -dissect_h235_ENCRYPTEDxxx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_h235_ENCRYPTED(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); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h235_ENCRYPTEDxxx, ENCRYPTEDxxx_sequence); + ett_h235_ENCRYPTED, ENCRYPTED_sequence); return offset; } @@ -591,7 +591,7 @@ dissect_h235_BIT_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const per_sequence_t SIGNEDxxx_sequence[] = { +static const per_sequence_t SIGNED_sequence[] = { { &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 }, @@ -600,12 +600,12 @@ static const per_sequence_t SIGNEDxxx_sequence[] = { }; int -dissect_h235_SIGNEDxxx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_h235_SIGNED(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); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h235_SIGNEDxxx, SIGNEDxxx_sequence); + ett_h235_SIGNED, SIGNED_sequence); return offset; } @@ -643,8 +643,8 @@ static const value_string h235_H235Key_vals[] = { static const per_choice_t H235Key_choice[] = { { 0, &hf_h235_secureChannel , ASN1_EXTENSION_ROOT , dissect_h235_KeyMaterial }, - { 1, &hf_h235_sharedSecret , ASN1_EXTENSION_ROOT , dissect_h235_ENCRYPTEDxxx }, - { 2, &hf_h235_certProtectedKey, ASN1_EXTENSION_ROOT , dissect_h235_SIGNEDxxx }, + { 1, &hf_h235_sharedSecret , ASN1_EXTENSION_ROOT , dissect_h235_ENCRYPTED }, + { 2, &hf_h235_certProtectedKey, ASN1_EXTENSION_ROOT , dissect_h235_SIGNED }, { 3, &hf_h235_secureSharedSecret, ASN1_NOT_EXTENSION_ROOT, dissect_h235_V3KeySyncMaterial }, { 0, NULL, 0, NULL } }; @@ -774,7 +774,7 @@ dissect_h235_ClearToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const per_sequence_t HASHEDxxx_sequence[] = { +static const per_sequence_t HASHED_sequence[] = { { &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 }, @@ -782,12 +782,12 @@ static const per_sequence_t HASHEDxxx_sequence[] = { }; int -dissect_h235_HASHEDxxx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_h235_HASHED(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); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h235_HASHEDxxx, HASHEDxxx_sequence); + ett_h235_HASHED, HASHED_sequence); return offset; } @@ -822,7 +822,7 @@ dissect_h235_EncodedPwdCertToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static const per_sequence_t T_cryptoEncryptedToken_sequence[] = { { &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 }, + { &hf_h235_encryptedToken , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ENCRYPTED }, { NULL, 0, 0, NULL } }; @@ -837,7 +837,7 @@ dissect_h235_T_cryptoEncryptedToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static const per_sequence_t T_cryptoSignedToken_sequence[] = { { &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 }, + { &hf_h235_signedToken , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_SIGNED }, { NULL, 0, 0, NULL } }; @@ -853,7 +853,7 @@ dissect_h235_T_cryptoSignedToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static const per_sequence_t T_cryptoHashedToken_sequence[] = { { &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 }, + { &hf_h235_hashedToken , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_HASHED }, { NULL, 0, 0, NULL } }; @@ -878,7 +878,7 @@ static const per_choice_t CryptoToken_choice[] = { { 0, &hf_h235_cryptoEncryptedToken, ASN1_EXTENSION_ROOT , dissect_h235_T_cryptoEncryptedToken }, { 1, &hf_h235_cryptoSignedToken, ASN1_EXTENSION_ROOT , dissect_h235_T_cryptoSignedToken }, { 2, &hf_h235_cryptoHashedToken, ASN1_EXTENSION_ROOT , dissect_h235_T_cryptoHashedToken }, - { 3, &hf_h235_cryptoPwdEncr , ASN1_EXTENSION_ROOT , dissect_h235_ENCRYPTEDxxx }, + { 3, &hf_h235_cryptoPwdEncr , ASN1_EXTENSION_ROOT , dissect_h235_ENCRYPTED }, { 0, NULL, 0, NULL } }; @@ -900,7 +900,7 @@ static const per_sequence_t KeySignedMaterial_sequence[] = { { &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 }, + { &hf_h235_encrptval , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ENCRYPTED }, { NULL, 0, 0, NULL } }; @@ -1401,7 +1401,7 @@ void proto_register_h235(void) { { &hf_h235_encryptedToken, { "token", "h235.token", FT_NONE, BASE_NONE, NULL, 0, - "h235.ENCRYPTEDxxx", HFILL }}, + "h235.ENCRYPTED", HFILL }}, { &hf_h235_cryptoSignedToken, { "cryptoSignedToken", "h235.cryptoSignedToken", FT_NONE, BASE_NONE, NULL, 0, @@ -1409,7 +1409,7 @@ void proto_register_h235(void) { { &hf_h235_signedToken, { "token", "h235.token", FT_NONE, BASE_NONE, NULL, 0, - "h235.SIGNEDxxx", HFILL }}, + "h235.SIGNED", HFILL }}, { &hf_h235_cryptoHashedToken, { "cryptoHashedToken", "h235.cryptoHashedToken", FT_NONE, BASE_NONE, NULL, 0, @@ -1421,11 +1421,11 @@ void proto_register_h235(void) { { &hf_h235_hashedToken, { "token", "h235.token", FT_NONE, BASE_NONE, NULL, 0, - "h235.HASHEDxxx", HFILL }}, + "h235.HASHED", HFILL }}, { &hf_h235_cryptoPwdEncr, { "cryptoPwdEncr", "h235.cryptoPwdEncr", FT_NONE, BASE_NONE, NULL, 0, - "h235.ENCRYPTEDxxx", HFILL }}, + "h235.ENCRYPTED", HFILL }}, { &hf_h235_secureChannel, { "secureChannel", "h235.secureChannel", FT_BYTES, BASE_HEX, NULL, 0, @@ -1433,11 +1433,11 @@ void proto_register_h235(void) { { &hf_h235_sharedSecret, { "sharedSecret", "h235.sharedSecret", FT_NONE, BASE_NONE, NULL, 0, - "h235.ENCRYPTEDxxx", HFILL }}, + "h235.ENCRYPTED", HFILL }}, { &hf_h235_certProtectedKey, { "certProtectedKey", "h235.certProtectedKey", FT_NONE, BASE_NONE, NULL, 0, - "h235.SIGNEDxxx", HFILL }}, + "h235.SIGNED", HFILL }}, { &hf_h235_secureSharedSecret, { "secureSharedSecret", "h235.secureSharedSecret", FT_NONE, BASE_NONE, NULL, 0, @@ -1457,7 +1457,7 @@ void proto_register_h235(void) { { &hf_h235_encrptval, { "encrptval", "h235.encrptval", FT_NONE, BASE_NONE, NULL, 0, - "h235.ENCRYPTEDxxx", HFILL }}, + "h235.ENCRYPTED", HFILL }}, { &hf_h235_responseRandom, { "responseRandom", "h235.responseRandom", FT_INT32, BASE_DEC, NULL, 0, @@ -1609,9 +1609,9 @@ void proto_register_h235(void) { &ett_h235_SEQUENCE_OF_ProfileElement, &ett_h235_ProfileElement, &ett_h235_Element, - &ett_h235_SIGNEDxxx, - &ett_h235_ENCRYPTEDxxx, - &ett_h235_HASHEDxxx, + &ett_h235_SIGNED, + &ett_h235_ENCRYPTED, + &ett_h235_HASHED, &ett_h235_Params, &ett_h235_CryptoToken, &ett_h235_T_cryptoEncryptedToken, diff --git a/epan/dissectors/packet-h235.h b/epan/dissectors/packet-h235.h index ee901d3aa5..14e55a563c 100644 --- a/epan/dissectors/packet-h235.h +++ b/epan/dissectors/packet-h235.h @@ -42,9 +42,9 @@ extern const value_string h235_CryptoToken_vals[]; int dissect_h235_TimeStamp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h235_AuthenticationMechanism(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h235_ClearToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -int dissect_h235_SIGNEDxxx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -int dissect_h235_ENCRYPTEDxxx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -int dissect_h235_HASHEDxxx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h235_SIGNED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h235_ENCRYPTED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h235_HASHED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h235_SrtpCryptoCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h235_SrtpKeys(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index c298e8323a..c3bb1e8f3d 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -230,8 +230,8 @@ static int hf_h450_anyEntity = -1; /* NULL */ static int hf_h450_discardAnyUnrecognizedInvokePdu = -1; /* NULL */ static int hf_h450_clearCallIfAnyInvokePduNotRecognized = -1; /* NULL */ static int hf_h450_rejectAnyUnrecognizedInvokePdu = -1; /* NULL */ -static int hf_h450_rosApdus = -1; /* SEQUENCE_OF_ROSxxx */ -static int hf_h450_rosApdus_item = -1; /* ROSxxx */ +static int hf_h450_rosApdus = -1; /* SEQUENCE_OF_ROS */ +static int hf_h450_rosApdus_item = -1; /* ROS */ static int hf_h450_addressScreened_presentationAllowedAddress = -1; /* AddressScreened */ static int hf_h450_presentationRestricted = -1; /* NULL */ static int hf_h450_numberNotAvailableDueToInterworking = -1; /* NULL */ @@ -503,7 +503,7 @@ static gint ett_h450_NetworkFacilityExtension = -1; static gint ett_h450_EntityType = -1; static gint ett_h450_InterpretationApdu = -1; static gint ett_h450_ServiceApdus = -1; -static gint ett_h450_SEQUENCE_OF_ROSxxx = -1; +static gint ett_h450_SEQUENCE_OF_ROS = -1; static gint ett_h450_PresentedAddressScreened = -1; static gint ett_h450_PresentedAddressUnscreened = -1; static gint ett_h450_PresentedNumberScreened = -1; @@ -714,7 +714,7 @@ static const value_string localOpcode_vals[] = { }; static int dissect_h4501_Argument(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index); -static int dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_ind _U_); +static int dissect_ros_ROS(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_ind _U_); @@ -803,14 +803,14 @@ dissect_h450_InterpretationApdu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a } -static const per_sequence_t SEQUENCE_OF_ROSxxx_sequence_of[1] = { - { &hf_h450_rosApdus_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ros_ROSxxx }, +static const per_sequence_t SEQUENCE_OF_ROS_sequence_of[1] = { + { &hf_h450_rosApdus_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ros_ROS }, }; static int -dissect_h450_SEQUENCE_OF_ROSxxx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_h450_SEQUENCE_OF_ROS(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_h450_SEQUENCE_OF_ROSxxx, SEQUENCE_OF_ROSxxx_sequence_of); + ett_h450_SEQUENCE_OF_ROS, SEQUENCE_OF_ROS_sequence_of); return offset; } @@ -822,7 +822,7 @@ static const value_string h450_ServiceApdus_vals[] = { }; static const per_choice_t ServiceApdus_choice[] = { - { 0, &hf_h450_rosApdus , ASN1_EXTENSION_ROOT , dissect_h450_SEQUENCE_OF_ROSxxx }, + { 0, &hf_h450_rosApdus , ASN1_EXTENSION_ROOT , dissect_h450_SEQUENCE_OF_ROS }, { 0, NULL, 0, NULL } }; @@ -4091,7 +4091,7 @@ PER_NOT_DECODED_YET("Unrecognized H.450.x operation"); return offset; } static int -dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_ind _U_){ +dissect_ros_ROS(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_ind _U_){ offset = dissect_h4501_ROS(tvb, offset, actx, tree); return offset; @@ -4384,11 +4384,11 @@ void proto_register_h450(void) { { &hf_h450_rosApdus, { "rosApdus", "h450.rosApdus", FT_UINT32, BASE_DEC, NULL, 0, - "h450.SEQUENCE_OF_ROSxxx", HFILL }}, + "h450.SEQUENCE_OF_ROS", HFILL }}, { &hf_h450_rosApdus_item, { "Item", "h450.rosApdus_item", FT_NONE, BASE_NONE, NULL, 0, - "ros.ROSxxx", HFILL }}, + "ros.ROS", HFILL }}, { &hf_h450_addressScreened_presentationAllowedAddress, { "presentationAllowedAddress", "h450.presentationAllowedAddress", FT_NONE, BASE_NONE, NULL, 0, @@ -5399,7 +5399,7 @@ void proto_register_h450(void) { &ett_h450_EntityType, &ett_h450_InterpretationApdu, &ett_h450_ServiceApdus, - &ett_h450_SEQUENCE_OF_ROSxxx, + &ett_h450_SEQUENCE_OF_ROS, &ett_h450_PresentedAddressScreened, &ett_h450_PresentedAddressUnscreened, &ett_h450_PresentedNumberScreened, diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index ccdc841932..a62ce6e83b 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -662,7 +662,7 @@ static int dissect_extensionId(packet_info *pinfo _U_, proto_tree *tree _U_, tvb static int dissect_qsig_T_extensionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 65 "qsig.cnf" +#line 75 "qsig.cnf" |