generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix uninit warning. Remove unnecessary casts. Nothing to add is an error.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Ben Laurie 2015-09-07 18:33:09 +01:00
parent 5278dec375
commit 8c82de991b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/rehash.c
View File

@ -239,16 +239,17 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h)
BIO *b; BIO *b;
const char *ext; const char *ext;
unsigned char digest[EVP_MAX_MD_SIZE]; unsigned char digest[EVP_MAX_MD_SIZE];
int i, type, errs = 0; int type, errs = 0;
size_t i;
/* Does it end with a recognized extension? */ /* Does it end with a recognized extension? */
if ((ext = strrchr(filename, '.')) == NULL) if ((ext = strrchr(filename, '.')) == NULL)
goto end; goto end;
for (i = 0; i < (int)OSSL_NELEM(extensions); i++) { for (i = 0; i < OSSL_NELEM(extensions); i++) {
if (strcasecmp(extensions[i], ext + 1) == 0) if (strcasecmp(extensions[i], ext + 1) == 0)
break; break;
} }
if (i >= (int)OSSL_NELEM(extensions)) if (i >= OSSL_NELEM(extensions))
goto end; goto end;
/* Does it have X.509 data in it? */ /* Does it have X.509 data in it? */
@ -280,6 +281,9 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h)
type = TYPE_CRL; type = TYPE_CRL;
name = X509_CRL_get_issuer(x->crl); name = X509_CRL_get_issuer(x->crl);
X509_CRL_digest(x->crl, evpmd, digest, NULL); X509_CRL_digest(x->crl, evpmd, digest, NULL);
} else {
++errs;
goto end;
} }
if (name) { if (name) {
if ((h == HASH_NEW) || (h == HASH_BOTH)) if ((h == HASH_NEW) || (h == HASH_BOTH))
@ -303,7 +307,8 @@ static int do_dir(const char *dirname, enum Hash h)
OPENSSL_DIR_CTX *d = NULL; OPENSSL_DIR_CTX *d = NULL;
struct stat st; struct stat st;
unsigned char idmask[MAX_COLLISIONS / 8]; unsigned char idmask[MAX_COLLISIONS / 8];
int i, n, nextid, buflen, errs = 0; int n, nextid, buflen, errs = 0;
size_t i;
const char *pathsep; const char *pathsep;
const char *filename; const char *filename;
char *buf; char *buf;
@ -328,7 +333,7 @@ static int do_dir(const char *dirname, enum Hash h)
} }
OPENSSL_DIR_end(&d); OPENSSL_DIR_end(&d);
for (i = 0; i < (int)OSSL_NELEM(hash_table); i++) { for (i = 0; i < OSSL_NELEM(hash_table); i++) {
for (bp = hash_table[i]; bp; bp = nextbp) { for (bp = hash_table[i]; bp; bp = nextbp) {
nextbp = bp->next; nextbp = bp->next;
nextid = 0; nextid = 0;