osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2005-11-17 11:50:36 +00:00
parent 0af35b78dd
commit e2c9bcf703
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asn1/cms/packet-cms-template.c
View File

@ -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);

10
epan/dissectors/packet-cms.c
View File

@ -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);

2
epan/dissectors/packet-cms.h
View File

@ -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 */