summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-09-10 17:03:14 +0200
committerMatt Caswell <matt@openssl.org>2018-09-10 18:23:36 +0200
commit52307f94f8f3e5a1cd392f0a48802a24ccf73ba2 (patch)
treea7fd3059a0265702f63477de5771505c935c20ef /apps
parentMore updates to CHANGES and NEWS for the 1.1.1 release (diff)
downloadopenssl-52307f94f8f3e5a1cd392f0a48802a24ccf73ba2.tar.xz
openssl-52307f94f8f3e5a1cd392f0a48802a24ccf73ba2.zip
Don't cast an int * to a size_t *
If sizeof(int) != sizeof(size_t) this may not work correctly. Fixes a Coverity issue. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7168)
Diffstat (limited to 'apps')
-rw-r--r--apps/speed.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/apps/speed.c b/apps/speed.c
index c859c862dc..a4879179e4 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -600,6 +600,7 @@ typedef struct loopargs_st {
unsigned char *buf2_malloc;
unsigned char *key;
unsigned int siglen;
+ size_t sigsize;
#ifndef OPENSSL_NO_RSA
RSA *rsa_key[RSA_NUM];
#endif
@@ -1185,11 +1186,11 @@ static int EdDSA_sign_loop(void *args)
unsigned char *buf = tempargs->buf;
EVP_MD_CTX **edctx = tempargs->eddsa_ctx;
unsigned char *eddsasig = tempargs->buf2;
- unsigned int *eddsasiglen = &tempargs->siglen;
+ size_t *eddsasigsize = &tempargs->sigsize;
int ret, count;
for (count = 0; COND(eddsa_c[testnum][0]); count++) {
- ret = EVP_DigestSign(edctx[testnum], eddsasig, (size_t *)eddsasiglen, buf, 20);
+ ret = EVP_DigestSign(edctx[testnum], eddsasig, eddsasigsize, buf, 20);
if (ret == 0) {
BIO_printf(bio_err, "EdDSA sign failure\n");
ERR_print_errors(bio_err);
@@ -1206,11 +1207,11 @@ static int EdDSA_verify_loop(void *args)
unsigned char *buf = tempargs->buf;
EVP_MD_CTX **edctx = tempargs->eddsa_ctx;
unsigned char *eddsasig = tempargs->buf2;
- unsigned int eddsasiglen = tempargs->siglen;
+ size_t eddsasigsize = tempargs->sigsize;
int ret, count;
for (count = 0; COND(eddsa_c[testnum][1]); count++) {
- ret = EVP_DigestVerify(edctx[testnum], eddsasig, eddsasiglen, buf, 20);
+ ret = EVP_DigestVerify(edctx[testnum], eddsasig, eddsasigsize, buf, 20);
if (ret != 1) {
BIO_printf(bio_err, "EdDSA verify failure\n");
ERR_print_errors(bio_err);
@@ -1525,7 +1526,7 @@ int speed_main(int argc, char **argv)
const char *name;
unsigned int nid;
unsigned int bits;
- unsigned int siglen;
+ size_t sigsize;
} test_ed_curves[] = {
/* EdDSA */
{"Ed25519", NID_ED25519, 253, 64},
@@ -3101,9 +3102,9 @@ int speed_main(int argc, char **argv)
} else {
for (i = 0; i < loopargs_len; i++) {
/* Perform EdDSA signature test */
- loopargs[i].siglen = test_ed_curves[testnum].siglen;
+ loopargs[i].sigsize = test_ed_curves[testnum].sigsize;
st = EVP_DigestSign(loopargs[i].eddsa_ctx[testnum],
- loopargs[i].buf2, (size_t *)&loopargs[i].siglen,
+ loopargs[i].buf2, &loopargs[i].sigsize,
loopargs[i].buf, 20);
if (st == 0)
break;
@@ -3133,7 +3134,7 @@ int speed_main(int argc, char **argv)
/* Perform EdDSA verification test */
for (i = 0; i < loopargs_len; i++) {
st = EVP_DigestVerify(loopargs[i].eddsa_ctx[testnum],
- loopargs[i].buf2, loopargs[i].siglen,
+ loopargs[i].buf2, loopargs[i].sigsize,
loopargs[i].buf, 20);
if (st != 1)
break;