diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-11-17 11:50:36 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-11-17 11:50:36 +0000 |
| commit | e2c9bcf703c9dae280a18b8e8db746b9e7a25f1d (patch) | |
| tree | 4c8970b8fc3e14d7916982f50dbef72bcd854236 /epan/dissectors | |
| parent | 0af35b78ddeb4dbd20038620ad6ad7ef45446247 (diff) | |
| download | wireshark-e2c9bcf703c9dae280a18b8e8db746b9e7a25f1d.tar.gz | |
The SHA-1 routines now take const pointers; don't cast away constness.
tvb_get_ptr() returns a "const guint8 *"; don't bother casting its
return value to "const guint8 *".
"cms_verify_msg_digest()" can be passed a const pointer for "alg"; make
its argument a "const char *".
svn path=/trunk/; revision=16534
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-cms.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-cms.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index cedae74489..563e62dc0b 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-cms.c */ +/* ./packet-cms.c */ /* ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ /* Input file: packet-cms-template.c */ @@ -221,7 +221,7 @@ static proto_tree *top_tree=NULL; unsigned char digest_buf[MAX(SHA1_BUFFER_SIZE, MD5_BUFFER_SIZE)]; static void -cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, char *alg, tvbuff_t *tvb, int offset) +cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff_t *tvb, int offset) { sha1_context sha1_ctx; md5_state_t md5_ctx; @@ -234,8 +234,7 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, char *alg, tvbuff_t *tv sha1_starts(&sha1_ctx); - sha1_update(&sha1_ctx, - (guint8*)tvb_get_ptr(content, 0, tvb_length(content)), + sha1_update(&sha1_ctx, tvb_get_ptr(content, 0, tvb_length(content)), tvb_length(content)); sha1_finish(&sha1_ctx, digest_buf); @@ -246,8 +245,7 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, char *alg, tvbuff_t *tv md5_init(&md5_ctx); - md5_append(&md5_ctx, - (const guint8*) tvb_get_ptr(content, 0, tvb_length(content)), + md5_append(&md5_ctx, tvb_get_ptr(content, 0, tvb_length(content)), tvb_length(content)); md5_finish(&md5_ctx, digest_buf); diff --git a/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h index c64baf6d61..d6a776050c 100644 --- a/epan/dissectors/packet-cms.h +++ b/epan/dissectors/packet-cms.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-cms.h */ +/* ./packet-cms.h */ /* ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ /* Input file: packet-cms-template.h */ |