diff options
-rw-r--r-- | asn1/p7/p7.cnf | 116 | ||||
-rw-r--r-- | epan/dissectors/packet-p7.c | 96 |
2 files changed, 132 insertions, 80 deletions
diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf index e2190397e9..bc80d074c5 100644 --- a/asn1/p7/p7.cnf +++ b/asn1/p7/p7.cnf @@ -8,6 +8,7 @@ #.MODULE_IMPORT MTSAbstractService x411 +Reliable-Transfer-APDU rtse #.EXPORTS SequenceNumber @@ -212,67 +213,67 @@ OPERATION.&ResultType #.REGISTER # MSGeneralAttributeTypes -ReportLocation B "2.6.4.3.42" "id-att-ac-correlated-report-list" -SequenceNumber B "2.6.4.3.76" "id-att-ac-report-subject-entry" -ReportSummary B "2.6.4.3.43" "id-att-ac-report-summary" -PerRecipientReport B "2.6.4.3.44" "id-att-ac-uncorrelated-report-list" -AutoActionError B "2.6.4.3.46" "id-att-auto-action-error" -#Integer B "2.6.4.3.47" "id-att-auto-action-registration-identifier" - see XXX -SequenceNumber B "2.6.4.3.48" "id-att-auto-action-subject-entry" -AutoActionType B "2.6.4.3.49" "id-att-auto-action-type" +ReportLocation B "2.6.4.3.42" "id-att-ac-correlated-report-list" +SequenceNumber B "2.6.4.3.76" "id-att-ac-report-subject-entry" +ReportSummary B "2.6.4.3.43" "id-att-ac-report-summary" +PerRecipientReport B "2.6.4.3.44" "id-att-ac-uncorrelated-report-list" +AutoActionError B "2.6.4.3.46" "id-att-auto-action-error" +#Integer B "2.6.4.3.47" "id-att-auto-action-registration-identifier" - see XXX +SequenceNumber B "2.6.4.3.48" "id-att-auto-action-subject-entry" +AutoActionType B "2.6.4.3.49" "id-att-auto-action-type" #CertificateSelectors B "2.6.4.3.80" "id-att-certificate-selectors" - see x411.cnf -SequenceNumber B "2.6.4.3.0" "id-att-child-sequence-numbers" -#Content B "2.6.4.3.1" "id-att-content" - see XXX -#AlgorithmIdentifier B "2.6.4.3.2" "id-att-content-confidentiality-algorithm-identifier" - see XXX -#ContentCorrelator B "2.6.4.3.3" "id-att-content-correlator" - see x411.cnf -#ContentIdentifier B "2.6.4.3.4" "id-att-content-identifier" - see x411.cnf -#ContentIntegrityCheck B "2.6.4.3.5" "id-att-content-inetgrity-check" - see x411.cnf -#ContentLength B "2.6.4.3.6" "id-att-content-length" - see x411.cnf -#Boolean B "2.6.4.3.7" "id-att-content-returned" - see XXX -#ExtendedContentType B "2.6.4.3.8" "id-att-content-type" - see x411.cnf -#ConversionWithLossProhibited B "2.6.4.3.9" "id-att-conversion-with-loss-prohibited" - see x411.cnf -MS-EIT B "2.6.4.3.10" "id-att-converted-EITs" -CreationTime B "2.6.4.3.11" "id-att-creation-time" +SequenceNumber B "2.6.4.3.0" "id-att-child-sequence-numbers" +#Content B "2.6.4.3.1" "id-att-content" - see XXX +#AlgorithmIdentifier B "2.6.4.3.2" "id-att-content-confidentiality-algorithm-identifier" - see XXX +#ContentCorrelator B "2.6.4.3.3" "id-att-content-correlator" - see x411.cnf +#ContentIdentifier B "2.6.4.3.4" "id-att-content-identifier" - see x411.cnf +#ContentIntegrityCheck B "2.6.4.3.5" "id-att-content-inetgrity-check" - see x411.cnf +#ContentLength B "2.6.4.3.6" "id-att-content-length" - see x411.cnf +#Boolean B "2.6.4.3.7" "id-att-content-returned" - see XXX +#ExtendedContentType B "2.6.4.3.8" "id-att-content-type" - see x411.cnf +#ConversionWithLossProhibited B "2.6.4.3.9" "id-att-conversion-with-loss-prohibited" - see x411.cnf +MS-EIT B "2.6.4.3.10" "id-att-converted-EITs" +CreationTime B "2.6.4.3.11" "id-att-creation-time" DeferredDeliveryCancellationTime B "2.6.4.3.50" "id-att-deferred-delivery-cancellation-time" -#DeferredDeliveryTime B "2.6.4.3.51" "id-att-deferred-delivery-time" - see x411.cnf -DeletionTime B "2.6.4.3.52" "id-att-deletion-time" -MS-EIT B "2.6.4.3.12" "id-att-delivered-EITs" -#DeliveryFlags B "2.6.4.3.13" "id-att-delivery-flags" - see x411.cnf -#ORName B "2.6.4.3.78" "id-att-dl-exempted-recipients" - see x411.cnf -#DLExpansion B "2.6.4.3.14" "id-att-dl-expansion-history" - see x411.cnf -#DLExpansionProhibited B "2.6.4.3.53" "id-att-dl-expansion-prohibited" - see x411.cnf -EntryType B "2.6.4.3.16" "id-att-entry-type" +#DeferredDeliveryTime B "2.6.4.3.51" "id-att-deferred-delivery-time" - see x411.cnf +DeletionTime B "2.6.4.3.52" "id-att-deletion-time" +MS-EIT B "2.6.4.3.12" "id-att-delivered-EITs" +#DeliveryFlags B "2.6.4.3.13" "id-att-delivery-flags" - see x411.cnf +#ORName B "2.6.4.3.78" "id-att-dl-exempted-recipients" - see x411.cnf +#DLExpansion B "2.6.4.3.14" "id-att-dl-expansion-history" - see x411.cnf +#DLExpansionProhibited B "2.6.4.3.53" "id-att-dl-expansion-prohibited" - see x411.cnf +EntryType B "2.6.4.3.16" "id-att-entry-type" #InternalTraceInformationElement B "2.6.4.3.54" "id-att-internal-trace-information" - see x411.cnf -#LatestDeliveryTime B "2.6.4.3.55" "id-att-latest-delivery-time" - see x411.cnf -#NULL B "2.6.4.3.77" "id-att-locally-originated - see XXX -#NULL B "2.6.4.3.56" "id-att-marked-for-deletion" - see XXX -#MessageDeliveryEnvelope B "2.6.4.3.18" "id-att-message-delivery-envelope" - see x411.cnf -#MessageDeliveryTime B "2.6.4.3.20" "id-att-message-delivery-time" - see x411.cnf -MessageGroupName B "2.6.4.3.57" "id-att-message-group-name" -#MTSIdentifier B "2.6.4.3.19" "id-att-message-identifier" - see x411.cnf -#GeneralString B "2.6.4.3.58" "id-att-message-notes" - see XXX +#LatestDeliveryTime B "2.6.4.3.55" "id-att-latest-delivery-time" - see x411.cnf +#NULL B "2.6.4.3.77" "id-att-locally-originated - see XXX +#NULL B "2.6.4.3.56" "id-att-marked-for-deletion" - see XXX +#MessageDeliveryEnvelope B "2.6.4.3.18" "id-att-message-delivery-envelope" - see x411.cnf +#MessageDeliveryTime B "2.6.4.3.20" "id-att-message-delivery-time" - see x411.cnf +MessageGroupName B "2.6.4.3.57" "id-att-message-group-name" +#MTSIdentifier B "2.6.4.3.19" "id-att-message-identifier" - see x411.cnf +#GeneralString B "2.6.4.3.58" "id-att-message-notes" - see XXX #MessageOriginAuthenticationCheck B "2.6.4.3.21" "id-at-message-orgin-authentication-check" - see x411.cnf -#MessageSecurityLabel B "2.6.4.3.22" "id-att-message-security-label" - see x411.cnf -#MessageSubmissionEnvelope B "2.6.4.3.59" "id-att-message-submission-envelope" - see x411.cnf -#MessageSubmissionTime B "2.6.4.3.23" "id-att-message-submission-time" -#MessageToken B "2.6.4.3.24" "id-att-message-token" -#NULL B "2.6.4.3.60" "id-att-ms-originated" -SubmissionError B "2.6.4.3.61" "id-att-ms-submission-error" -#ExtendedCertificates B "2.6.4.3.81" "id-att-multiple-originator-certificates" - see x411.cnf -MS-EIT B "2.6.4.3.25" "id-att-original-EITs" -#ORName B "2.6.4.3.17" "id-att-originally-intended-recipient-name" - see x411.cnf -#OriginatingMTACertificate B "2.6.4.3.62" "id-att-originating-MTA-certificate" - see x411.cnf -#OriginatorCertificate B "2.6.4.3.26" "id-att-originator-certificate" - see x411.cnf -#ORName B "2.6.4.3.27" "id-att-originator-name" - see x411.cnf -#OriginatorReportRequest B "2.6.4.3.63" "id-att-originator-report-request" - see x411.cnf -#OriginatorReturnAddress B "2.6.4.3.64" "id-att-originator-return-address" - see x411.cnf -#ORName B "2.6.4.3.28" "id-att-other-recipient-names" - see x411.cnf -SequenceNumber B "2.6.4.3.29" "id-att-parent-sequence-number" -#PerMessageIndicators B "2.6.4.3.65" "id-att-per-message-indicators" - see x411.cnf +#MessageSecurityLabel B "2.6.4.3.22" "id-att-message-security-label" - see x411.cnf +#MessageSubmissionEnvelope B "2.6.4.3.59" "id-att-message-submission-envelope" - see x411.cnf +#MessageSubmissionTime B "2.6.4.3.23" "id-att-message-submission-time" +#MessageToken B "2.6.4.3.24" "id-att-message-token" +#NULL B "2.6.4.3.60" "id-att-ms-originated" +SubmissionError B "2.6.4.3.61" "id-att-ms-submission-error" +#ExtendedCertificates B "2.6.4.3.81" "id-att-multiple-originator-certificates" - see x411.cnf +MS-EIT B "2.6.4.3.25" "id-att-original-EITs" +#ORName B "2.6.4.3.17" "id-att-originally-intended-recipient-name" - see x411.cnf +#OriginatingMTACertificate B "2.6.4.3.62" "id-att-originating-MTA-certificate" - see x411.cnf +#OriginatorCertificate B "2.6.4.3.26" "id-att-originator-certificate" - see x411.cnf +#ORName B "2.6.4.3.27" "id-att-originator-name" - see x411.cnf +#OriginatorReportRequest B "2.6.4.3.63" "id-att-originator-report-request" - see x411.cnf +#OriginatorReturnAddress B "2.6.4.3.64" "id-att-originator-return-address" - see x411.cnf +#ORName B "2.6.4.3.28" "id-att-other-recipient-names" - see x411.cnf +SequenceNumber B "2.6.4.3.29" "id-att-parent-sequence-number" +#PerMessageIndicators B "2.6.4.3.65" "id-att-per-message-indicators" - see x411.cnf #PerRecipientMessageSubmissionFields B "2.6.4.3.66" "id-att-per-recipient-message-submission-fields" - see x411.cnf #PerRecipientProbeSubmissionFields B "2.6.4.3.67" "id-att-per-recipient-probe-submission-fields" - see x411.cnf #PerRecipientReportDeliveryFields B "2.6.4.3.30" "id-att-per-recipient-report-delivery-fields" - see x411.cnf -#Priority B "2.6.4.3.31" "id-att-priority" - see x411.cnf +#Priority B "2.6.4.3.31" "id-att-priority" - see x411.cnf #ProbeOriginAuthenticationCheck B "2.6.4.3.68" "id-att-probe-origin-authentication-check" - see x411.cnf #ProbeSubmissionEnvelope B "2.6.4.3.69" "id-att-probe-submission-envelope" - see x411.cnf #ProofOfDeliveryRequest B "2.6.4.3.32" "id-att-proof-of-delivery-request" - see x411.cnf @@ -295,6 +296,13 @@ StorageTime B "2.6.4.3.74" "id-att-storage-time" #ORName B "2.6.4.3.41" "id-att-this-recipient-name" - see x411.cnf #TraceInformationElement B "2.6.4.3.75" "id-att-trace-information" - see x411.cnf +#MSExtensions +ChangeCredentialsAlgorithms B "2.6.4.9.5" "id-ext-protected-change-credentials-capability" +OriginatorToken B "2.6.4.9.3" "id-ext-originator-token" +ProtectedChangeCredentials B "2.6.4.9.4" "id-ext-protected-change-credentials" + +RTSE-apdus B "2.6.0.2.10""id-as-ms-rtse" + #.FN_PARS AttributeType FN_VARIANT = _str VAL_PTR = &object_identifier_id #.FN_BODY Attribute/attribute-values/_item diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index 377ab7a4b8..f404521447 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -83,8 +83,10 @@ static int hf_p7_MessageGroupName_PDU = -1; /* MessageGroupName */ static int hf_p7_MSBindArgument_PDU = -1; /* MSBindArgument */ static int hf_p7_MSBindResult_PDU = -1; /* MSBindResult */ static int hf_p7_MS_EIT_PDU = -1; /* MS_EIT */ +static int hf_p7_ChangeCredentialsAlgorithms_PDU = -1; /* ChangeCredentialsAlgorithms */ static int hf_p7_PAR_ms_bind_error_PDU = -1; /* PAR_ms_bind_error */ static int hf_p7_CreationTime_PDU = -1; /* CreationTime */ +static int hf_p7_OriginatorToken_PDU = -1; /* OriginatorToken */ static int hf_p7_SummarizeArgument_PDU = -1; /* SummarizeArgument */ static int hf_p7_SummarizeResult_PDU = -1; /* SummarizeResult */ static int hf_p7_ListArgument_PDU = -1; /* ListArgument */ @@ -95,6 +97,7 @@ static int hf_p7_DeleteArgument_PDU = -1; /* DeleteArgument */ static int hf_p7_DeleteResult_PDU = -1; /* DeleteResult */ static int hf_p7_Register_MSArgument_PDU = -1; /* Register_MSArgument */ static int hf_p7_Register_MSResult_PDU = -1; /* Register_MSResult */ +static int hf_p7_ProtectedChangeCredentials_PDU = -1; /* ProtectedChangeCredentials */ static int hf_p7_AlertArgument_PDU = -1; /* AlertArgument */ static int hf_p7_AlertResult_PDU = -1; /* AlertResult */ static int hf_p7_ModifyArgument_PDU = -1; /* ModifyArgument */ @@ -125,6 +128,7 @@ static int hf_p7_SubmissionError_PDU = -1; /* SubmissionError */ static int hf_p7_SignatureVerificationStatus_PDU = -1; /* SignatureVerificationStatus */ static int hf_p7_StoragePeriod_PDU = -1; /* StoragePeriod */ static int hf_p7_StorageTime_PDU = -1; /* StorageTime */ +static int hf_p7_RTSE_apdus_PDU = -1; /* RTSE_apdus */ static int hf_p7_attribute_type = -1; /* AttributeType */ static int hf_p7_attribute_values = -1; /* AttributeValues */ static int hf_p7_attribute_values_item = -1; /* AttributeItem */ @@ -728,7 +732,7 @@ dissect_p7_AutoActionType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_p7_INTEGER_1_ub_per_auto_action(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; } @@ -837,7 +841,7 @@ static const value_string p7_EntryClass_vals[] = { static int dissect_p7_EntryClass(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; } @@ -858,7 +862,7 @@ static const value_string p7_EntryType_vals[] = { static int dissect_p7_EntryType(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; } @@ -868,7 +872,7 @@ dissect_p7_EntryType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U int dissect_p7_SequenceNumber(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, - &seqno); + &seqno); return offset; } @@ -885,7 +889,7 @@ static const value_string p7_RetrievalStatus_vals[] = { static int dissect_p7_RetrievalStatus(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; } @@ -980,7 +984,7 @@ dissect_p7_MS_EITs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_p7_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; } @@ -1111,7 +1115,7 @@ dissect_p7_T_matching_rules_supported(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_p7_INTEGER_1_ub_group_depth(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; } @@ -1602,7 +1606,7 @@ dissect_p7_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_p7_INTEGER_1_ub_messages(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; } @@ -1647,7 +1651,7 @@ dissect_p7_Selector(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_p7_INTEGER_1_ub_attribute_values(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; } @@ -1657,7 +1661,7 @@ dissect_p7_INTEGER_1_ub_attribute_values(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_p7_INTEGER_0_ub_attribute_values(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; } @@ -1840,7 +1844,7 @@ dissect_p7_T_count(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, int count = 0; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - &count); + &count); if (check_col(actx->pinfo->cinfo, COL_INFO)) { @@ -2531,7 +2535,7 @@ dissect_p7_Register_MSResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p7_INTEGER_1_ub_auto_actions(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; } @@ -2860,7 +2864,7 @@ static const value_string p7_AttributeProblem_vals[] = { static int dissect_p7_AttributeProblem(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; } @@ -2932,7 +2936,7 @@ static const value_string p7_AutoActionRequestProblem_vals[] = { static int dissect_p7_AutoActionRequestProblem(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; } @@ -2993,7 +2997,7 @@ static const value_string p7_DeleteProblem_vals[] = { static int dissect_p7_DeleteProblem(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; } @@ -3053,7 +3057,7 @@ static const value_string p7_FetchRestrictionProblem_vals[] = { static int dissect_p7_FetchRestrictionProblem(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; } @@ -3143,7 +3147,7 @@ static const value_string p7_RangeProblem_vals[] = { static int dissect_p7_RangeProblem(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; } @@ -3172,7 +3176,7 @@ static const value_string p7_SequenceNumberProblem_vals[] = { static int dissect_p7_SequenceNumberProblem(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; } @@ -3231,7 +3235,7 @@ static const value_string p7_ServiceProblem_vals[] = { static int dissect_p7_ServiceProblem(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; } @@ -3267,7 +3271,7 @@ static const value_string p7_MessageGroupProblem_vals[] = { static int dissect_p7_MessageGroupProblem(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; } @@ -3355,7 +3359,7 @@ static const value_string p7_ModifyProblem_vals[] = { static int dissect_p7_ModifyProblem(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; } @@ -3414,7 +3418,7 @@ dissect_p7_EntryClassErrorParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_p7_INTEGER_1_ub_recipients(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; } @@ -3573,7 +3577,7 @@ const value_string p7_SignatureStatus_vals[] = { int dissect_p7_SignatureStatus(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; } @@ -3602,7 +3606,7 @@ dissect_p7_SignatureVerificationStatus(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_p7_StoragePeriod(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; } @@ -3623,7 +3627,7 @@ dissect_p7_StorageTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p7_RTTPapdu(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; } @@ -3655,7 +3659,7 @@ static const value_string p7_AbortReason_vals[] = { static int dissect_p7_AbortReason(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; } @@ -3767,6 +3771,11 @@ static void dissect_MS_EIT_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); dissect_p7_MS_EIT(FALSE, tvb, 0, &asn1_ctx, tree, hf_p7_MS_EIT_PDU); } +static void dissect_ChangeCredentialsAlgorithms_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + dissect_p7_ChangeCredentialsAlgorithms(FALSE, tvb, 0, &asn1_ctx, tree, hf_p7_ChangeCredentialsAlgorithms_PDU); +} static int dissect_PAR_ms_bind_error_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -3779,6 +3788,11 @@ static void dissect_CreationTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); dissect_p7_CreationTime(FALSE, tvb, 0, &asn1_ctx, tree, hf_p7_CreationTime_PDU); } +static void dissect_OriginatorToken_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + dissect_p7_OriginatorToken(FALSE, tvb, 0, &asn1_ctx, tree, hf_p7_OriginatorToken_PDU); +} static int dissect_SummarizeArgument_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -3849,6 +3863,11 @@ static int dissect_Register_MSResult_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ offset = dissect_p7_Register_MSResult(FALSE, tvb, offset, &asn1_ctx, tree, hf_p7_Register_MSResult_PDU); return offset; } +static void dissect_ProtectedChangeCredentials_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + dissect_p7_ProtectedChangeCredentials(FALSE, tvb, 0, &asn1_ctx, tree, hf_p7_ProtectedChangeCredentials_PDU); +} static int dissect_AlertArgument_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -4041,6 +4060,11 @@ static void dissect_StorageTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); dissect_p7_StorageTime(FALSE, tvb, 0, &asn1_ctx, tree, hf_p7_StorageTime_PDU); } +static void dissect_RTSE_apdus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + dissect_p7_RTSE_apdus(FALSE, tvb, 0, &asn1_ctx, tree, hf_p7_RTSE_apdus_PDU); +} /*--- End of included file: packet-p7-fn.c ---*/ @@ -4173,6 +4197,10 @@ void proto_register_p7(void) { { "MS-EIT", "p7.MS_EIT", FT_OID, BASE_NONE, NULL, 0, "p7.MS_EIT", HFILL }}, + { &hf_p7_ChangeCredentialsAlgorithms_PDU, + { "ChangeCredentialsAlgorithms", "p7.ChangeCredentialsAlgorithms", + FT_UINT32, BASE_DEC, NULL, 0, + "p7.ChangeCredentialsAlgorithms", HFILL }}, { &hf_p7_PAR_ms_bind_error_PDU, { "PAR-ms-bind-error", "p7.PAR_ms_bind_error", FT_UINT32, BASE_DEC, VALS(p7_PAR_ms_bind_error_vals), 0, @@ -4181,6 +4209,10 @@ void proto_register_p7(void) { { "CreationTime", "p7.CreationTime", FT_STRING, BASE_NONE, NULL, 0, "p7.CreationTime", HFILL }}, + { &hf_p7_OriginatorToken_PDU, + { "OriginatorToken", "p7.OriginatorToken", + FT_NONE, BASE_NONE, NULL, 0, + "p7.OriginatorToken", HFILL }}, { &hf_p7_SummarizeArgument_PDU, { "SummarizeArgument", "p7.SummarizeArgument", FT_NONE, BASE_NONE, NULL, 0, @@ -4221,6 +4253,10 @@ void proto_register_p7(void) { { "Register-MSResult", "p7.Register_MSResult", FT_UINT32, BASE_DEC, VALS(p7_Register_MSResult_vals), 0, "p7.Register_MSResult", HFILL }}, + { &hf_p7_ProtectedChangeCredentials_PDU, + { "ProtectedChangeCredentials", "p7.ProtectedChangeCredentials", + FT_NONE, BASE_NONE, NULL, 0, + "p7.ProtectedChangeCredentials", HFILL }}, { &hf_p7_AlertArgument_PDU, { "AlertArgument", "p7.AlertArgument", FT_NONE, BASE_NONE, NULL, 0, @@ -4341,6 +4377,10 @@ void proto_register_p7(void) { { "StorageTime", "p7.StorageTime", FT_STRING, BASE_NONE, NULL, 0, "p7.StorageTime", HFILL }}, + { &hf_p7_RTSE_apdus_PDU, + { "RTSE-apdus", "p7.RTSE_apdus", + FT_UINT32, BASE_DEC, VALS(p7_RTSE_apdus_vals), 0, + "p7.RTSE_apdus", HFILL }}, { &hf_p7_attribute_type, { "attribute-type", "p7.attribute_type", FT_OID, BASE_NONE, NULL, 0, @@ -5775,6 +5815,10 @@ void proto_reg_handoff_p7(void) { register_ber_oid_dissector("2.6.4.3.79", dissect_SignatureVerificationStatus_PDU, proto_p7, "id-att-signature-verification-status"); register_ber_oid_dissector("2.6.4.3.73", dissect_StoragePeriod_PDU, proto_p7, "id-att-storage-period"); register_ber_oid_dissector("2.6.4.3.74", dissect_StorageTime_PDU, proto_p7, "id-att-storage-time"); + register_ber_oid_dissector("2.6.4.9.5", dissect_ChangeCredentialsAlgorithms_PDU, proto_p7, "id-ext-protected-change-credentials-capability"); + register_ber_oid_dissector("2.6.4.9.3", dissect_OriginatorToken_PDU, proto_p7, "id-ext-originator-token"); + register_ber_oid_dissector("2.6.4.9.4", dissect_ProtectedChangeCredentials_PDU, proto_p7, "id-ext-protected-change-credentials"); + register_ber_oid_dissector("2.6.0.2.10""id-as-ms-rtse", dissect_RTSE_apdus_PDU, proto_p7, ""); /*--- End of included file: packet-p7-dis-tab.c ---*/ |