diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-11-14 10:02:31 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-11-14 10:02:31 +0000 |
| commit | 3b770d5c7c9aa12a455d6307b762b3fca875fbf7 (patch) | |
| tree | e8f6231cfc7a837d8fc9901a7a676180dce93bd1 /epan/dissectors/packet-pkixqualified.c | |
| parent | 0496eb5dcabb32c36084b2efb620fe6fe9a50b12 (diff) | |
| download | wireshark-3b770d5c7c9aa12a455d6307b762b3fca875fbf7.tar.gz | |
- dissect_ber_object_identifier() returns value as tvb
- new dissect_ber_object_identifier_str() function
- BER dissectors adapted and regenerated
svn path=/trunk/; revision=16501
Diffstat (limited to 'epan/dissectors/packet-pkixqualified.c')
| -rw-r--r-- | epan/dissectors/packet-pkixqualified.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index 52e35a70f6..d409ce5e53 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* ./packet-pkixqualified.c */ +/* .\packet-pkixqualified.c */ /* ../../tools/asn2eth.py -X -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */ /* Input file: packet-pkixqualified-template.c */ @@ -94,7 +94,7 @@ static gint ett_pkixqualified_NameRegistrationAuthorities = -1; /*--- End of included file: packet-pkixqualified-ett.c ---*/ -static char object_identifier_id[BER_MAX_OID_STR_LEN]; +static const char *object_identifier_id; /*--- Included file: packet-pkixqualified-fn.c ---*/ @@ -160,8 +160,7 @@ static int dissect_predefinedBiometricType(packet_info *pinfo, proto_tree *tree, static int dissect_pkixqualified_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); return offset; } @@ -261,9 +260,7 @@ dissect_pkixqualified_BiometricSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, static int dissect_pkixqualified_T_statementId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, - hf_pkixqualified_statementId, object_identifier_id); - + offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_pkixqualified_statementId, &object_identifier_id); return offset; } @@ -317,7 +314,7 @@ dissect_pkixqualified_QCStatements(gboolean implicit_tag _U_, tvbuff_t *tvb, int static const ber_sequence_t NameRegistrationAuthorities_sequence_of[1] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_NameRegistrationAuthorities_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_NameRegistrationAuthorities_item }, }; static int |