wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix no-ec

Browse source 
Fix some unguarded references to EC code inside the FIPS provider.

Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9543)
This commit is contained in:
Matt Caswell 2019-08-07 09:38:05 +01:00
parent 3505d70bad
commit f92e0815b8
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
providers/fips/fipsprov.c
View file

@ -104,7 +104,9 @@ static int dummy_evp_call(void *provctx)
BIGNUM *a = NULL, *b = NULL; BIGNUM *a = NULL, *b = NULL;
unsigned char randbuf[128]; unsigned char randbuf[128];
RAND_DRBG *drbg = OPENSSL_CTX_get0_public_drbg(libctx); RAND_DRBG *drbg = OPENSSL_CTX_get0_public_drbg(libctx);
#ifndef OPENSSL_NO_EC
EC_KEY *key = NULL; EC_KEY *key = NULL;
#endif
if (ctx == NULL || sha256 == NULL || drbg == NULL) if (ctx == NULL || sha256 == NULL || drbg == NULL)
goto err; goto err;
@ -138,6 +140,7 @@ static int dummy_evp_call(void *provctx)
if (!BN_rand_ex(a, 256, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, bnctx)) if (!BN_rand_ex(a, 256, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, bnctx))
goto err; goto err;
#ifndef OPENSSL_NO_EC
/* Do some dummy EC calls */ /* Do some dummy EC calls */
key = EC_KEY_new_by_curve_name_ex(libctx, NID_X9_62_prime256v1); key = EC_KEY_new_by_curve_name_ex(libctx, NID_X9_62_prime256v1);
if (key == NULL) if (key == NULL)
@ -145,6 +148,7 @@ static int dummy_evp_call(void *provctx)
if (!EC_KEY_generate_key(key)) if (!EC_KEY_generate_key(key))
goto err; goto err;
#endif
ret = 1; ret = 1;
err: err:
@ -154,7 +158,9 @@ static int dummy_evp_call(void *provctx)
EVP_MD_CTX_free(ctx); EVP_MD_CTX_free(ctx);
EVP_MD_meth_free(sha256); EVP_MD_meth_free(sha256);
#ifndef OPENSSL_NO_EC
EC_KEY_free(key); EC_KEY_free(key);
#endif
return ret; return ret;
} }