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 /asn1/x509af | |
| 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 'asn1/x509af')
| -rw-r--r-- | asn1/x509af/packet-x509af-template.c | 4 | ||||
| -rw-r--r-- | asn1/x509af/x509af.cnf | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index 1f8a2993b9..393a052eea 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -54,10 +54,10 @@ static int hf_x509af_extension_id = -1; static gint ett_pkix_crl = -1; #include "packet-x509af-ett.c" -static char algorithm_id[BER_MAX_OID_STR_LEN]; +static const char *algorithm_id; -static char extension_id[BER_MAX_OID_STR_LEN]; +static const char *extension_id; #include "packet-x509af-fn.c" diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf index 942155eddf..4bde694356 100644 --- a/asn1/x509af/x509af.cnf +++ b/asn1/x509af/x509af.cnf @@ -66,16 +66,15 @@ IssuerSerial/issuer issuerName CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate revokedUserCertificate #.END -#.FN_BODY AlgorithmIdentifier/algorithmId - offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, - hf_x509af_algorithm_id, algorithm_id); +#.FN_PARS AlgorithmIdentifier/algorithmId + FN_VARIANT = _str HF_INDEX = hf_x509af_algorithm_id VAL_PTR = &algorithm_id + #.FN_BODY AlgorithmIdentifier/parameters offset=call_ber_oid_callback(algorithm_id, tvb, offset, pinfo, tree); -#.FN_BODY Extension/extnId - offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, - hf_x509af_extension_id, extension_id); +#.FN_PARS Extension/extnId + FN_VARIANT = _str HF_INDEX = hf_x509af_extension_id VAL_PTR = &extension_id #.FN_BODY Extension/extnValue gint8 class; |