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 /asn1/cms | |
| parent | 0af35b78ddeb4dbd20038620ad6ad7ef45446247 (diff) | |
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 'asn1/cms')
| -rw-r--r-- | asn1/cms/packet-cms-template.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 48115551a1..8812e79031 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -78,7 +78,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; @@ -91,8 +91,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); @@ -103,8 +102,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); |