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

Skip unsupported digests in evp_test

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-02-26 19:58:20 +00:00
parent 7406e32396
commit 578ce42d35
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/evp/evp_test.c
View File

@ -290,6 +290,7 @@ static int setup_test(struct evp_test *t, const struct evp_test_method *tmeth)
if (t->meth) { if (t->meth) {
t->ntests++; t->ntests++;
if (t->skip) { if (t->skip) {
t->meth = tmeth;
t->nskip++; t->nskip++;
return 1; return 1;
} }
@ -543,8 +544,14 @@ static int digest_test_init(struct evp_test *t, const char *alg)
const EVP_MD *digest; const EVP_MD *digest;
struct digest_data *mdat = t->data; struct digest_data *mdat = t->data;
digest = EVP_get_digestbyname(alg); digest = EVP_get_digestbyname(alg);
if (!digest) if (!digest) {
/* If alg has an OID assume disabled algorithm */
if (OBJ_sn2nid(alg) != NID_undef || OBJ_ln2nid(alg) != NID_undef) {
t->skip = 1;
return 1;
}
return 0; return 0;
}
mdat = OPENSSL_malloc(sizeof(struct digest_data)); mdat = OPENSSL_malloc(sizeof(struct digest_data));
mdat->digest = digest; mdat->digest = digest;
mdat->input = NULL; mdat->input = NULL;