diff options
| -rw-r--r-- | asn1/acse/acse.cnf | 4 | ||||
| -rw-r--r-- | asn1/cmip/cmip.cnf | 2 | ||||
| -rw-r--r-- | asn1/cms/cms.cnf | 5 | ||||
| -rw-r--r-- | asn1/h235/h235.cnf | 4 | ||||
| -rw-r--r-- | asn1/inap/packet-inap-template.c | 96 | ||||
| -rw-r--r-- | epan/dissectors/packet-acse.c | 57 | ||||
| -rw-r--r-- | epan/dissectors/packet-cmip.c | 48 | ||||
| -rw-r--r-- | epan/dissectors/packet-cms.c | 50 | ||||
| -rw-r--r-- | epan/dissectors/packet-h235.c | 110 |
9 files changed, 131 insertions, 245 deletions
diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index 909bccf96a..9b41f16336 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -5,6 +5,10 @@ #.IMPORT ../x509if/x509if-exp.cnf +#.OMIT_ASSIGNMENT +Application-context-name +#.END + #.EXPORTS EXTERNALt AE-title diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index 14874bc913..538a4c542c 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -403,7 +403,7 @@ RejectProblem break; case 18: /* missingAttributeValue */ /* Hmmm SET OF AttributeId */ - dissect_cmip_AttributeId(FALSE, tvb, offset, actx, tree, -1); + dissect_cmip_PAR_missingAttributeValue(FALSE, tvb, offset, actx, tree, -1); break; case 9: /* noSuchAction */ dissect_cmip_NoSuchAction(FALSE, tvb, offset, actx, tree, -1); diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 1452d4a843..dcfb10c1ba 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -6,6 +6,11 @@ #.IMPORT ../x509af/x509af-exp.cnf #.IMPORT ../x509if/x509if-exp.cnf +#.OMIT_ASSIGNMENT +KeyWrapAlgorithm +CBCParameter +#.END + #.EXPORTS ContentInfo ContentType diff --git a/asn1/h235/h235.cnf b/asn1/h235/h235.cnf index 74032a5448..4ed1075ca7 100644 --- a/asn1/h235/h235.cnf +++ b/asn1/h235/h235.cnf @@ -29,9 +29,13 @@ H235CertificateSignature EncodedGeneralToken EncodedPwdCertToken +PwdCertToken EncodedKeySignedMaterial +KeySignedMaterial EncodedReturnSig +ReturnSig EncodedKeySyncMaterial +KeySyncMaterial #.END #.FIELD_RENAME diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c index d0b6377118..044af5bc1e 100644 --- a/asn1/inap/packet-inap-template.c +++ b/asn1/inap/packet-inap-template.c @@ -222,153 +222,153 @@ TC-Invokable OPERATION ::= static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) { switch(opcode){ case 0: /*InitialDP*/ - offset=dissect_inap_InitialDPArg(FALSE, tvb, offset, actx, tree, hf_inap_InitialDPArg_PDU); + offset=dissect_inap_InitialDPArg(FALSE, tvb, offset, actx, tree, -1); break; case 1: /*1 OriginationAttemptAuthorized */ - offset=dissect_inap_OriginationAttemptAuthorizedArg(FALSE, tvb, offset, actx, tree, hf_inap_OriginationAttemptAuthorizedArg_PDU); + offset=dissect_inap_OriginationAttemptAuthorizedArg(FALSE, tvb, offset, actx, tree, -1); break; case 2: /*2 CollectedInformation */ - offset=dissect_inap_CollectedInformationArg(FALSE, tvb, offset, actx, tree, hf_inap_CollectedInformationArg_PDU); + offset=dissect_inap_CollectedInformationArg(FALSE, tvb, offset, actx, tree, -1); break; case 3: /*3 AnalysedInformation */ - offset=dissect_inap_AnalysedInformationArg(FALSE, tvb, offset, actx, tree, hf_inap_AnalysedInformationArg_PDU); + offset=dissect_inap_AnalysedInformationArg(FALSE, tvb, offset, actx, tree, -1); break; case 4: /*4 RouteSelectFailure */ - offset=dissect_inap_RouteSelectFailureArg(FALSE, tvb, offset, actx, tree, hf_inap_RouteSelectFailureArg_PDU); + offset=dissect_inap_RouteSelectFailureArg(FALSE, tvb, offset, actx, tree, -1); break; case 5: /*5 oCalledPartyBusy */ - offset=dissect_inap_OCalledPartyBusyArg(FALSE, tvb, offset, actx, tree, hf_inap_OCalledPartyBusyArg_PDU); + offset=dissect_inap_OCalledPartyBusyArg(FALSE, tvb, offset, actx, tree, -1); break; case 6: /*6 oNoAnswer */ - offset=dissect_inap_ONoAnswerArg(FALSE, tvb, offset, actx, tree, hf_inap_ONoAnswerArg_PDU); + offset=dissect_inap_ONoAnswerArg(FALSE, tvb, offset, actx, tree, -1); break; case 7: /*7 oAnswer */ - offset=dissect_inap_OAnswerArg(FALSE, tvb, offset, actx, tree, hf_inap_OAnswerArg_PDU); + offset=dissect_inap_OAnswerArg(FALSE, tvb, offset, actx, tree, -1); break; case 8: /*8 oDisconnect */ - offset=dissect_inap_ODisconnectArg(FALSE, tvb, offset, actx, tree, hf_inap_ODisconnectArg_PDU); + offset=dissect_inap_ODisconnectArg(FALSE, tvb, offset, actx, tree, -1); break; case 9: /*9 TermAttemptAuthorized */ - offset=dissect_inap_TermAttemptAuthorizedArg(FALSE, tvb, offset, actx, tree, hf_inap_TermAttemptAuthorizedArg_PDU); + offset=dissect_inap_TermAttemptAuthorizedArg(FALSE, tvb, offset, actx, tree, -1); break; case 10: /*10 tBusy */ - offset=dissect_inap_TBusyArg(FALSE, tvb, offset, actx, tree, hf_inap_TBusyArg_PDU); + offset=dissect_inap_TBusyArg(FALSE, tvb, offset, actx, tree, -1); break; case 11: /*11 tNoAnswer */ - offset=dissect_inap_TNoAnswerArg(FALSE, tvb, offset, actx, tree, hf_inap_TNoAnswerArg_PDU); + offset=dissect_inap_TNoAnswerArg(FALSE, tvb, offset, actx, tree, -1); break; case 12: /*12 tAnswer */ - offset=dissect_inap_TAnswerArg(FALSE, tvb, offset, actx, tree, hf_inap_TAnswerArg_PDU); + offset=dissect_inap_TAnswerArg(FALSE, tvb, offset, actx, tree, -1); break; case 13: /*13 tDisconnect */ - offset=dissect_inap_TDisconnectArg(FALSE, tvb, offset, actx, tree, hf_inap_TDisconnectArg_PDU); + offset=dissect_inap_TDisconnectArg(FALSE, tvb, offset, actx, tree, -1); break; case 14: /*14 oMidCall */ - offset=dissect_inap_MidCallArg(FALSE, tvb, offset, actx, tree, hf_inap_MidCallArg_PDU); + offset=dissect_inap_MidCallArg(FALSE, tvb, offset, actx, tree, -1); break; case 15: /*15 tMidCall */ - offset=dissect_inap_MidCallArg(FALSE, tvb, offset, actx, tree, hf_inap_MidCallArg_PDU); + offset=dissect_inap_MidCallArg(FALSE, tvb, offset, actx, tree, -1); break; case 16: /*AssistRequestInstructions*/ - offset=dissect_inap_AssistRequestInstructionsArg(FALSE, tvb, offset, actx, tree, hf_inap_AssistRequestInstructionsArg_PDU); + offset=dissect_inap_AssistRequestInstructionsArg(FALSE, tvb, offset, actx, tree, -1); break; case 17: /*EstablishTemporaryConnection*/ - offset=dissect_inap_EstablishTemporaryConnectionArg(FALSE, tvb, offset, actx, tree, hf_inap_EstablishTemporaryConnectionArg_PDU); + offset=dissect_inap_EstablishTemporaryConnectionArg(FALSE, tvb, offset, actx, tree, -1); break; case 18: /*DisconnectForwardConnections*/ proto_tree_add_text(tree, tvb, offset, -1, "Disconnect Forward Connection"); break; case 19: /*ConnectToResource*/ - offset=dissect_inap_ConnectToResourceArg(FALSE, tvb, offset, actx, tree, hf_inap_ConnectToResourceArg_PDU); + offset=dissect_inap_ConnectToResourceArg(FALSE, tvb, offset, actx, tree, -1); break; case 20: /*Connect*/ - offset=dissect_inap_ConnectArg(FALSE, tvb, offset, actx, tree,hf_inap_ConnectArg_PDU); + offset=dissect_inap_ConnectArg(FALSE, tvb, offset, actx, tree,-1); break; case 21: /* 21 HoldCallInNetwork */ - offset=dissect_inap_HoldCallInNetworkArg(FALSE, tvb, offset, actx, tree,hf_inap_HoldCallInNetworkArg_PDU); + offset=dissect_inap_HoldCallInNetworkArg(FALSE, tvb, offset, actx, tree,-1); break; case 22: /*ReleaseCall*/ - offset=dissect_inap_ReleaseCallArg(FALSE, tvb, offset, actx, tree,hf_inap_ReleaseCallArg_PDU); + offset=dissect_inap_ReleaseCallArg(FALSE, tvb, offset, actx, tree,-1); break; case 23: /*InitialDP*/ - offset=dissect_inap_RequestReportBCSMEventArg(FALSE, tvb, offset, actx, tree, hf_inap_RequestReportBCSMEventArg_PDU); + offset=dissect_inap_RequestReportBCSMEventArg(FALSE, tvb, offset, actx, tree, -1); break; case 24: /*EventReportBCSM*/ - offset=dissect_inap_EventReportBCSMArg(FALSE, tvb, offset, actx, tree, hf_inap_EventReportBCSMArg_PDU); + offset=dissect_inap_EventReportBCSMArg(FALSE, tvb, offset, actx, tree, -1); break; case 25: /*25, "RequestNotificationChargingEvent */ - offset=dissect_inap_RequestNotificationChargingEventArg(FALSE, tvb, offset, actx, tree, hf_inap_RequestNotificationChargingEventArg_PDU); + offset=dissect_inap_RequestNotificationChargingEventArg(FALSE, tvb, offset, actx, tree, -1); break; case 26: /*26, "EventNotificationCharging */ - offset=dissect_inap_EventNotificationChargingArg(FALSE, tvb, offset, actx, tree, hf_inap_EventNotificationChargingArg_PDU); + offset=dissect_inap_EventNotificationChargingArg(FALSE, tvb, offset, actx, tree, -1); break; case 27: /*27, "CollectInformation */ - offset=dissect_inap_CollectInformationArg(FALSE, tvb, offset, actx, tree, hf_inap_CollectInformationArg_PDU); + offset=dissect_inap_CollectInformationArg(FALSE, tvb, offset, actx, tree, -1); break; case 28: /*28, "AnalyseInformation */ - offset=dissect_inap_AnalyseInformationArg(FALSE, tvb, offset, actx, tree, hf_inap_AnalyseInformationArg_PDU); + offset=dissect_inap_AnalyseInformationArg(FALSE, tvb, offset, actx, tree, -1); break; case 29: /*29, "SelectRoute */ - offset=dissect_inap_SelectRouteArg(FALSE, tvb, offset, actx, tree, hf_inap_SelectRouteArg_PDU); + offset=dissect_inap_SelectRouteArg(FALSE, tvb, offset, actx, tree, -1); break; case 30: /*30, "SelectFacility */ - offset=dissect_inap_SelectFacilityArg(FALSE, tvb, offset, actx, tree, hf_inap_SelectFacilityArg_PDU); + offset=dissect_inap_SelectFacilityArg(FALSE, tvb, offset, actx, tree, -1); break; /*31, "Continue */ case 32: /*32, InitiateCallAttempt*/ - offset=dissect_inap_InitiateCallAttemptArg(FALSE, tvb, offset, actx, tree, hf_inap_InitiateCallAttemptArg_PDU); + offset=dissect_inap_InitiateCallAttemptArg(FALSE, tvb, offset, actx, tree, -1); break; case 33: /*ResetTimer*/ - offset=dissect_inap_ResetTimerArg(FALSE, tvb, offset, actx, tree, hf_inap_ResetTimerArg_PDU); + offset=dissect_inap_ResetTimerArg(FALSE, tvb, offset, actx, tree, -1); break; case 34: /*FurnishChargingInformation*/ - offset=dissect_inap_FurnishChargingInformationArg(FALSE, tvb, offset, actx, tree, hf_inap_FurnishChargingInformationArg_PDU); + offset=dissect_inap_FurnishChargingInformationArg(FALSE, tvb, offset, actx, tree, -1); break; case 35: /*35, ApplyCharging */ - offset=dissect_inap_ApplyChargingArg(FALSE, tvb, offset, actx, tree, hf_inap_ApplyChargingArg_PDU); + offset=dissect_inap_ApplyChargingArg(FALSE, tvb, offset, actx, tree, -1); break; case 36: /*36, "ApplyChargingReport */ - offset=dissect_inap_ApplyChargingReportArg(FALSE, tvb, offset, actx, tree, hf_inap_ApplyChargingReportArg_PDU); + offset=dissect_inap_ApplyChargingReportArg(FALSE, tvb, offset, actx, tree, -1); break; case 37: /*37, "RequestCurrentStatusReport */ - offset=dissect_inap_RequestCurrentStatusReportArg(FALSE, tvb, offset, actx, tree, hf_inap_RequestCurrentStatusReportArg_PDU); + offset=dissect_inap_RequestCurrentStatusReportArg(FALSE, tvb, offset, actx, tree, -1); break; case 38:/*38, "RequestEveryStatusChangeReport */ - offset=dissect_inap_RequestEveryStatusChangeReportArg(FALSE, tvb, offset, actx, tree, hf_inap_RequestEveryStatusChangeReportArg_PDU); + offset=dissect_inap_RequestEveryStatusChangeReportArg(FALSE, tvb, offset, actx, tree, -1); break; case 39:/*39, "RequestFirstStatusMatchReport */ - offset=dissect_inap_RequestFirstStatusMatchReportArg(FALSE, tvb, offset, actx, tree, hf_inap_RequestFirstStatusMatchReportArg_PDU); + offset=dissect_inap_RequestFirstStatusMatchReportArg(FALSE, tvb, offset, actx, tree, -1); break; case 40:/*40, "StatusReport */ - offset=dissect_inap_StatusReportArg(FALSE, tvb, offset, actx, tree, hf_inap_StatusReportArg_PDU); + offset=dissect_inap_StatusReportArg(FALSE, tvb, offset, actx, tree, -1); break; case 41:/*41, "CallGap */ - offset=dissect_inap_CallGapArg(FALSE, tvb, offset, actx, tree, hf_inap_CallGapArg_PDU); + offset=dissect_inap_CallGapArg(FALSE, tvb, offset, actx, tree, -1); break; case 42:/*42, "ActivateServiceFiltering */ - offset=dissect_inap_ActivateServiceFilteringArg(FALSE, tvb, offset, actx, tree, hf_inap_ActivateServiceFilteringArg_PDU); + offset=dissect_inap_ActivateServiceFilteringArg(FALSE, tvb, offset, actx, tree, -1); break; case 43:/*43, "ServiceFilteringResponse */ - offset=dissect_inap_ServiceFilteringResponseArg(FALSE, tvb, offset, actx, tree, hf_inap_ServiceFilteringResponseArg_PDU); + offset=dissect_inap_ServiceFilteringResponseArg(FALSE, tvb, offset, actx, tree, -1); break; case 44: /*CallInformationReport*/ - offset=dissect_inap_CallInformationReportArg(FALSE, tvb, offset, actx, tree, hf_inap_CallInformationReportArg_PDU); + offset=dissect_inap_CallInformationReportArg(FALSE, tvb, offset, actx, tree, -1); break; case 45: /*CallInformationRequest*/ - offset=dissect_inap_CallInformationRequestArg(FALSE, tvb, offset, actx, tree, hf_inap_CallInformationRequestArg_PDU); + offset=dissect_inap_CallInformationRequestArg(FALSE, tvb, offset, actx, tree, -1); break; case 47: /*PlayAnnouncement*/ - offset=dissect_inap_PlayAnnouncementArg(FALSE, tvb, offset, actx, tree, hf_inap_PlayAnnouncementArg_PDU); + offset=dissect_inap_PlayAnnouncementArg(FALSE, tvb, offset, actx, tree, -1); break; case 48: /*PromptAndCollectUserInformation*/ - offset=dissect_inap_PromptAndCollectUserInformationArg(FALSE, tvb, offset, actx, tree, hf_inap_PromptAndCollectUserInformationArg_PDU); + offset=dissect_inap_PromptAndCollectUserInformationArg(FALSE, tvb, offset, actx, tree, -1); break; case 49: /* 49 SpecializedResourceReport */ - offset=dissect_inap_SpecializedResourceReportArg(FALSE, tvb, offset, actx, tree, hf_inap_SpecializedResourceReportArg_PDU); + offset=dissect_inap_SpecializedResourceReportArg(FALSE, tvb, offset, actx, tree, -1); break; case 53: /*Cancel*/ - offset=dissect_inap_CancelArg(FALSE, tvb, offset, actx, tree, hf_inap_CancelArg_PDU); + offset=dissect_inap_CancelArg(FALSE, tvb, offset, actx, tree, -1); break; case 80: /*FacilitySelectedAndAvailable*/ offset = dissect_inap_FacilitySelectedAndAvailableArg(FALSE, tvb, offset, actx, tree, -1); diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 8e3f157357..40433c0a2a 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -319,7 +319,7 @@ dissect_acse_T_direct_reference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_acse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 67 "acse.cnf" +#line 71 "acse.cnf" char *oid; offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_acse_indirect_reference, @@ -353,7 +353,7 @@ dissect_acse_ObjectDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_acse_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 84 "acse.cnf" +#line 88 "acse.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree); @@ -365,7 +365,7 @@ dissect_acse_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_acse_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 87 "acse.cnf" +#line 91 "acse.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree); @@ -463,7 +463,7 @@ dissect_acse_ASO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_acse_T_AARQ_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 51 "acse.cnf" +#line 55 "acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -539,7 +539,7 @@ dissect_acse_ASO_qualifier_form1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_acse_ASO_qualifier_form2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -605,7 +605,7 @@ dissect_acse_AE_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs int dissect_acse_AP_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -615,7 +615,7 @@ dissect_acse_AP_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _ int dissect_acse_AE_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -671,7 +671,7 @@ dissect_acse_T_other_mechanism_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_acse_T_other_mechanism_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 45 "acse.cnf" +#line 49 "acse.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree); @@ -749,7 +749,7 @@ dissect_acse_Implementation_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_acse_Presentation_context_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -869,7 +869,7 @@ dissect_acse_Syntactic_context_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_acse_ASOI_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -976,7 +976,7 @@ dissect_acse_T_AARE_protocol_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_acse_T_AARE_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 55 "acse.cnf" +#line 59 "acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -997,7 +997,7 @@ static const value_string acse_Associate_result_vals[] = { static int dissect_acse_Associate_result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1026,7 +1026,7 @@ static const value_string acse_T_acse_service_user_vals[] = { static int dissect_acse_T_acse_service_user(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1043,7 +1043,7 @@ static const value_string acse_T_acse_service_provider_vals[] = { static int dissect_acse_T_acse_service_provider(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1082,7 +1082,7 @@ static const value_string acse_Result_vals[] = { static int dissect_acse_Result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1109,7 +1109,7 @@ static const value_string acse_T_provider_reason_vals[] = { static int dissect_acse_T_provider_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1194,11 +1194,11 @@ static const value_string acse_Release_request_reason_vals[] = { static int dissect_acse_Release_request_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 93 "acse.cnf" +#line 97 "acse.cnf" int reason = -1; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - &reason); + &reason); if((reason != -1) && check_col(actx->pinfo->cinfo, COL_INFO)) @@ -1248,11 +1248,11 @@ static const value_string acse_Release_response_reason_vals[] = { static int dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 105 "acse.cnf" +#line 109 "acse.cnf" int reason = -1; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - &reason); + &reason); if((reason != -1) && check_col(actx->pinfo->cinfo, COL_INFO)) @@ -1302,7 +1302,7 @@ static const value_string acse_ABRT_source_vals[] = { static int dissect_acse_ABRT_source(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1378,7 +1378,7 @@ dissect_acse_Simply_encoded_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_acse_T_simple_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 48 "acse.cnf" +#line 52 "acse.cnf" /*XXX not implemented yet */ @@ -1490,7 +1490,7 @@ dissect_acse_A_DT_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_acse_T_ACRQ_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 59 "acse.cnf" +#line 63 "acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -1532,7 +1532,7 @@ dissect_acse_ACRQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_acse_T_ACRP_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 63 "acse.cnf" +#line 67 "acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -1606,15 +1606,6 @@ dissect_acse_ACSE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int -dissect_acse_Application_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_acse_ASO_context_name(implicit_tag, tvb, offset, actx, tree, hf_index); - - return offset; -} - - - -static int dissect_acse_AE_title_form1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_x509if_Name(implicit_tag, tvb, offset, actx, tree, hf_index); diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 635d82d2e9..3fa5eaba31 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -748,7 +748,7 @@ dissect_cmip_T_objectClasslocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -908,7 +908,7 @@ static const value_string cmip_T_namedNumbers_vals[] = { static int dissect_cmip_T_namedNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -918,7 +918,7 @@ dissect_cmip_T_namedNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_cmip_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1456,7 +1456,7 @@ static const value_string cmip_ModifyOperator_vals[] = { static int dissect_cmip_ModifyOperator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2500,7 +2500,7 @@ static const value_string cmip_AlarmStatus_item_vals[] = { static int dissect_cmip_AlarmStatus_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2536,7 +2536,7 @@ static const value_string cmip_AvailabilityStatus_item_vals[] = { static int dissect_cmip_AvailabilityStatus_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2603,7 +2603,7 @@ dissect_cmip_BackUpRelationshipObject(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_cmip_INTEGER_0_100(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2643,7 +2643,7 @@ static const value_string cmip_ControlStatus_item_vals[] = { static int dissect_cmip_ControlStatus_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2666,7 +2666,7 @@ dissect_cmip_ControlStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_cmip_NotificationIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2717,7 +2717,7 @@ dissect_cmip_CorrelatedNotifications(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_cmip_CurrentLogSize(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2758,7 +2758,7 @@ dissect_cmip_GroupObjects(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_cmip_INTEGER_0_23(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2768,7 +2768,7 @@ dissect_cmip_INTEGER_0_23(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_cmip_INTEGER_0_59(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2910,7 +2910,7 @@ static const value_string cmip_MaxLogSize_vals[] = { static int dissect_cmip_MaxLogSize(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2942,7 +2942,7 @@ dissect_cmip_NameBinding(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_cmip_NumberOfRecords(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3048,7 +3048,7 @@ static const value_string cmip_T_priority_vals[] = { static int dissect_cmip_T_priority(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3117,7 +3117,7 @@ static const value_string cmip_ProceduralStatus_item_vals[] = { static int dissect_cmip_ProceduralStatus_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3299,7 +3299,7 @@ static const value_string cmip_StandbyStatus_vals[] = { static int dissect_cmip_StandbyStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3600,7 +3600,7 @@ static int dissect_cmip_T_local(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 243 "cmip.cnf" offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - &opcode); + &opcode); if(opcode_type== OPCODE_RETURN_ERROR){ if(check_col(actx->pinfo->cinfo, COL_INFO)){ @@ -3643,7 +3643,7 @@ dissect_cmip_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_cmip_InvokeId_present(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3864,7 +3864,7 @@ dissect_cmip_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse break; case 18: /* missingAttributeValue */ /* Hmmm SET OF AttributeId */ - dissect_cmip_AttributeId(FALSE, tvb, offset, actx, tree, -1); + dissect_cmip_PAR_missingAttributeValue(FALSE, tvb, offset, actx, tree, -1); break; case 9: /* noSuchAction */ dissect_cmip_NoSuchAction(FALSE, tvb, offset, actx, tree, -1); @@ -3940,7 +3940,7 @@ static const value_string cmip_GeneralProblem_vals[] = { static int dissect_cmip_GeneralProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3962,7 +3962,7 @@ static const value_string cmip_InvokeProblem_vals[] = { static int dissect_cmip_InvokeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3979,7 +3979,7 @@ static const value_string cmip_ReturnResultProblem_vals[] = { static int dissect_cmip_ReturnResultProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3998,7 +3998,7 @@ static const value_string cmip_ReturnErrorProblem_vals[] = { static int dissect_cmip_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 1cbda7874f..0f2b1b39d7 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -303,7 +303,7 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff int dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 71 "cms.cnf" +#line 76 "cms.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -323,7 +323,7 @@ dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cms_T_content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 81 "cms.cnf" +#line 86 "cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -341,7 +341,7 @@ static const ber_sequence_t ContentInfo_sequence[] = { int dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 62 "cms.cnf" +#line 67 "cms.cnf" top_tree = tree; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ContentInfo_sequence, hf_index, ett_cms_ContentInfo); @@ -368,7 +368,7 @@ static const value_string cms_CMSVersion_vals[] = { static int dissect_cms_CMSVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -399,7 +399,7 @@ dissect_cms_DigestAlgorithmIdentifiers(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_cms_T_eContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 85 "cms.cnf" +#line 90 "cms.cnf" gint8 class; gboolean pc, ind; gint32 tag; @@ -441,7 +441,7 @@ dissect_cms_EncapsulatedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 113 "cms.cnf" +#line 118 "cms.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id); @@ -461,7 +461,7 @@ dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cms_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 123 "cms.cnf" +#line 128 "cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -903,7 +903,7 @@ dissect_cms_T_keyAttrId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cms_T_keyAttr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 106 "cms.cnf" +#line 111 "cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1104,14 +1104,14 @@ dissect_cms_ContentEncryptionAlgorithmIdentifier(gboolean implicit_tag _U_, tvbu static int dissect_cms_EncryptedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 173 "cms.cnf" +#line 178 "cms.cnf" tvbuff_t *encrypted_tvb; proto_item *item; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &encrypted_tvb); -#line 178 "cms.cnf" +#line 183 "cms.cnf" item = actx->created_item; @@ -1269,7 +1269,7 @@ dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 127 "cms.cnf" +#line 132 "cms.cnf" proto_item *pi; int old_offset = offset; @@ -1345,21 +1345,12 @@ dissect_cms_Countersignature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int -dissect_cms_KeyWrapAlgorithm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index); - - return offset; -} - - - -static int dissect_cms_RC2ParameterVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 163 "cms.cnf" +#line 168 "cms.cnf" guint32 length = 0; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - &length); + &length); if(cap_tree != NULL) @@ -1392,18 +1383,9 @@ dissect_cms_IV(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn static int -dissect_cms_CBCParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_cms_IV(implicit_tag, tvb, offset, actx, tree, hf_index); - - return offset; -} - - - -static int dissect_cms_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1427,7 +1409,7 @@ dissect_cms_RC2CBCParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 145 "cms.cnf" +#line 150 "cms.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id); @@ -1448,7 +1430,7 @@ dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_cms_T_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 156 "cms.cnf" +#line 161 "cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index 8e6e9a6dbc..2f81cc603d 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -137,13 +137,6 @@ static int hf_h235_secureChannel = -1; /* KeyMaterial */ 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; /* ENCRYPTED */ -static int hf_h235_responseRandom = -1; /* RandomVal */ -static int hf_h235_requestRandom = -1; /* RandomVal */ -static int hf_h235_keyMaterial = -1; /* KeyMaterial */ static int hf_h235_encryptedSessionKey = -1; /* OCTET_STRING */ static int hf_h235_encryptedSaltingKey = -1; /* OCTET_STRING */ static int hf_h235_clearSaltingKey = -1; /* OCTET_STRING */ @@ -203,9 +196,6 @@ static gint ett_h235_T_cryptoEncryptedToken = -1; static gint ett_h235_T_cryptoSignedToken = -1; static gint ett_h235_T_cryptoHashedToken = -1; static gint ett_h235_H235Key = -1; -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; @@ -572,7 +562,7 @@ static const per_sequence_t ENCRYPTED_sequence[] = { int dissect_h235_ENCRYPTED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 61 "h235.cnf" +#line 65 "h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -604,7 +594,7 @@ static const per_sequence_t SIGNED_sequence[] = { int dissect_h235_SIGNED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 56 "h235.cnf" +#line 60 "h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -769,7 +759,7 @@ static const per_sequence_t ClearToken_sequence[] = { int dissect_h235_ClearToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 72 "h235.cnf" +#line 76 "h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -790,7 +780,7 @@ static const per_sequence_t HASHED_sequence[] = { int dissect_h235_HASHED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 66 "h235.cnf" +#line 70 "h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -802,15 +792,6 @@ dissect_h235_HASHED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } - -static int -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; -} - - 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_ENCRYPTED }, @@ -875,7 +856,7 @@ static const per_choice_t CryptoToken_choice[] = { int dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 78 "h235.cnf" +#line 82 "h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -888,56 +869,6 @@ dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } -static const per_sequence_t KeySignedMaterial_sequence[] = { - { &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_ENCRYPTED }, - { NULL, 0, 0, NULL } -}; - -static int -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); - - return offset; -} - - -static const per_sequence_t ReturnSig_sequence[] = { - { &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 -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); - - return offset; -} - - -static const per_sequence_t KeySyncMaterial_sequence[] = { - { &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 -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); - - return offset; -} - - static int dissect_h235_INTEGER_0_24(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1423,34 +1354,6 @@ void proto_register_h235(void) { { "secureSharedSecret", "h235.secureSharedSecret", FT_NONE, BASE_NONE, NULL, 0, "h235.V3KeySyncMaterial", HFILL }}, - { &hf_h235_generalId, - { "generalId", "h235.generalId", - FT_STRING, BASE_NONE, NULL, 0, - "h235.Identifier", HFILL }}, - { &hf_h235_mrandom, - { "mrandom", "h235.mrandom", - FT_INT32, BASE_DEC, NULL, 0, - "h235.RandomVal", HFILL }}, - { &hf_h235_srandom, - { "srandom", "h235.srandom", - FT_INT32, BASE_DEC, NULL, 0, - "h235.RandomVal", HFILL }}, - { &hf_h235_encrptval, - { "encrptval", "h235.encrptval", - FT_NONE, BASE_NONE, NULL, 0, - "h235.ENCRYPTED", HFILL }}, - { &hf_h235_responseRandom, - { "responseRandom", "h235.responseRandom", - FT_INT32, BASE_DEC, NULL, 0, - "h235.RandomVal", HFILL }}, - { &hf_h235_requestRandom, - { "requestRandom", "h235.requestRandom", - FT_INT32, BASE_DEC, NULL, 0, - "h235.RandomVal", HFILL }}, - { &hf_h235_keyMaterial, - { "keyMaterial", "h235.keyMaterial", - FT_BYTES, BASE_HEX, NULL, 0, - "h235.KeyMaterial", HFILL }}, { &hf_h235_encryptedSessionKey, { "encryptedSessionKey", "h235.encryptedSessionKey", FT_BYTES, BASE_HEX, NULL, 0, @@ -1599,9 +1502,6 @@ void proto_register_h235(void) { &ett_h235_T_cryptoSignedToken, &ett_h235_T_cryptoHashedToken, &ett_h235_H235Key, - &ett_h235_KeySignedMaterial, - &ett_h235_ReturnSig, - &ett_h235_KeySyncMaterial, &ett_h235_V3KeySyncMaterial, &ett_h235_SrtpCryptoCapability, &ett_h235_SrtpCryptoInfo, |