diff options
Diffstat (limited to 'epan/dissectors/packet-pkixqualified.c')
-rw-r--r-- | epan/dissectors/packet-pkixqualified.c | 124 |
1 files changed, 41 insertions, 83 deletions
diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index d880b83518..0be2632ab8 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkixqualified.c */ -/* ../../tools/asn2wrs.py -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */ +/* packet-pkixqualified.c */ +/* ../../tools/asn2wrs.py -b -X -T -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */ /* Input file: packet-pkixqualified-template.c */ @@ -101,15 +101,6 @@ static const char *object_identifier_id; /*--- Included file: packet-pkixqualified-fn.c ---*/ #line 1 "packet-pkixqualified-fn.c" -/*--- Fields for imported types ---*/ - -static int dissect_hashAlgorithm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_x509af_AlgorithmIdentifier(FALSE, tvb, offset, actx, tree, hf_pkixqualified_hashAlgorithm); -} -static int dissect_NameRegistrationAuthorities_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_x509ce_GeneralName(FALSE, tvb, offset, actx, tree, hf_pkixqualified_NameRegistrationAuthorities_item); -} - static int @@ -154,9 +145,6 @@ dissect_pkixqualified_PredefinedBiometricType(gboolean implicit_tag _U_, tvbuff_ return offset; } -static int dissect_predefinedBiometricType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_PredefinedBiometricType(FALSE, tvb, offset, actx, tree, hf_pkixqualified_predefinedBiometricType); -} @@ -166,12 +154,6 @@ dissect_pkixqualified_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_biometricDataOid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_OBJECT_IDENTIFIER(FALSE, tvb, offset, actx, tree, hf_pkixqualified_biometricDataOid); -} -static int dissect_semanticsIdentifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_OBJECT_IDENTIFIER(FALSE, tvb, offset, actx, tree, hf_pkixqualified_semanticsIdentifier); -} static const value_string pkixqualified_TypeOfBiometricData_vals[] = { @@ -180,23 +162,20 @@ static const value_string pkixqualified_TypeOfBiometricData_vals[] = { { 0, NULL } }; -static const ber_old_choice_t TypeOfBiometricData_choice[] = { - { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_predefinedBiometricType }, - { 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_biometricDataOid }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t TypeOfBiometricData_choice[] = { + { 0, &hf_pkixqualified_predefinedBiometricType, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pkixqualified_PredefinedBiometricType }, + { 1, &hf_pkixqualified_biometricDataOid, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_pkixqualified_OBJECT_IDENTIFIER }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_pkixqualified_TypeOfBiometricData(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_old_choice(actx, tree, tvb, offset, - TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData, + NULL); return offset; } -static int dissect_typeOfBiometricData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_TypeOfBiometricData(FALSE, tvb, offset, actx, tree, hf_pkixqualified_typeOfBiometricData); -} @@ -207,9 +186,6 @@ dissect_pkixqualified_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_biometricDataHash(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_OCTET_STRING(FALSE, tvb, offset, actx, tree, hf_pkixqualified_biometricDataHash); -} @@ -221,39 +197,33 @@ dissect_pkixqualified_IA5String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_sourceDataUri(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_IA5String(FALSE, tvb, offset, actx, tree, hf_pkixqualified_sourceDataUri); -} -static const ber_old_sequence_t BiometricData_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeOfBiometricData }, - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm }, - { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_biometricDataHash }, - { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sourceDataUri }, - { 0, 0, 0, NULL } +static const ber_sequence_t BiometricData_sequence[] = { + { &hf_pkixqualified_typeOfBiometricData, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pkixqualified_TypeOfBiometricData }, + { &hf_pkixqualified_hashAlgorithm, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x509af_AlgorithmIdentifier }, + { &hf_pkixqualified_biometricDataHash, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_pkixqualified_OCTET_STRING }, + { &hf_pkixqualified_sourceDataUri, BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pkixqualified_IA5String }, + { NULL, 0, 0, 0, NULL } }; static int dissect_pkixqualified_BiometricData(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_old_sequence(implicit_tag, actx, tree, tvb, offset, - BiometricData_sequence, hf_index, ett_pkixqualified_BiometricData); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + BiometricData_sequence, hf_index, ett_pkixqualified_BiometricData); return offset; } -static int dissect_BiometricSyntax_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_BiometricData(FALSE, tvb, offset, actx, tree, hf_pkixqualified_BiometricSyntax_item); -} -static const ber_old_sequence_t BiometricSyntax_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BiometricSyntax_item }, +static const ber_sequence_t BiometricSyntax_sequence_of[1] = { + { &hf_pkixqualified_BiometricSyntax_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_pkixqualified_BiometricData }, }; static int dissect_pkixqualified_BiometricSyntax(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_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - BiometricSyntax_sequence_of, hf_index, ett_pkixqualified_BiometricSyntax); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + BiometricSyntax_sequence_of, hf_index, ett_pkixqualified_BiometricSyntax); return offset; } @@ -266,9 +236,6 @@ dissect_pkixqualified_T_statementId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ return offset; } -static int dissect_statementId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_T_statementId(FALSE, tvb, offset, actx, tree, hf_pkixqualified_statementId); -} @@ -281,68 +248,59 @@ dissect_pkixqualified_T_statementInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _ return offset; } -static int dissect_statementInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_T_statementInfo(FALSE, tvb, offset, actx, tree, hf_pkixqualified_statementInfo); -} -static const ber_old_sequence_t QCStatement_sequence[] = { - { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_statementId }, - { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_statementInfo }, - { 0, 0, 0, NULL } +static const ber_sequence_t QCStatement_sequence[] = { + { &hf_pkixqualified_statementId, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_pkixqualified_T_statementId }, + { &hf_pkixqualified_statementInfo, BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pkixqualified_T_statementInfo }, + { NULL, 0, 0, 0, NULL } }; static int dissect_pkixqualified_QCStatement(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_old_sequence(implicit_tag, actx, tree, tvb, offset, - QCStatement_sequence, hf_index, ett_pkixqualified_QCStatement); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + QCStatement_sequence, hf_index, ett_pkixqualified_QCStatement); return offset; } -static int dissect_QCStatements_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_QCStatement(FALSE, tvb, offset, actx, tree, hf_pkixqualified_QCStatements_item); -} -static const ber_old_sequence_t QCStatements_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_QCStatements_item }, +static const ber_sequence_t QCStatements_sequence_of[1] = { + { &hf_pkixqualified_QCStatements_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_pkixqualified_QCStatement }, }; static int dissect_pkixqualified_QCStatements(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_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - QCStatements_sequence_of, hf_index, ett_pkixqualified_QCStatements); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + QCStatements_sequence_of, hf_index, ett_pkixqualified_QCStatements); return offset; } -static const ber_old_sequence_t NameRegistrationAuthorities_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_NameRegistrationAuthorities_item }, +static const ber_sequence_t NameRegistrationAuthorities_sequence_of[1] = { + { &hf_pkixqualified_NameRegistrationAuthorities_item, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_x509ce_GeneralName }, }; static int dissect_pkixqualified_NameRegistrationAuthorities(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_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - NameRegistrationAuthorities_sequence_of, hf_index, ett_pkixqualified_NameRegistrationAuthorities); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + NameRegistrationAuthorities_sequence_of, hf_index, ett_pkixqualified_NameRegistrationAuthorities); return offset; } -static int dissect_nameRegistrationAuthorities(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_pkixqualified_NameRegistrationAuthorities(FALSE, tvb, offset, actx, tree, hf_pkixqualified_nameRegistrationAuthorities); -} -static const ber_old_sequence_t SemanticsInformation_sequence[] = { - { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_semanticsIdentifier }, - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nameRegistrationAuthorities }, - { 0, 0, 0, NULL } +static const ber_sequence_t SemanticsInformation_sequence[] = { + { &hf_pkixqualified_semanticsIdentifier, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pkixqualified_OBJECT_IDENTIFIER }, + { &hf_pkixqualified_nameRegistrationAuthorities, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pkixqualified_NameRegistrationAuthorities }, + { NULL, 0, 0, 0, NULL } }; static int dissect_pkixqualified_SemanticsInformation(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_old_sequence(implicit_tag, actx, tree, tvb, offset, - SemanticsInformation_sequence, hf_index, ett_pkixqualified_SemanticsInformation); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + SemanticsInformation_sequence, hf_index, ett_pkixqualified_SemanticsInformation); return offset; } |