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

Change the DRBG HASH implementation to lookup all allowed algorithm names

Browse source 
We use the new function ossl_prov_util_nid_to_name() to look up the
algorithm and unify the FIPS_MODE and non-FIPS_MODE handling.

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/9035)
This commit is contained in:
Matt Caswell 2019-06-20 11:51:08 +01:00
parent 4cecf7a127
commit 671aaecd36
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
crypto/rand/drbg_hash.c
View file

@ -14,6 +14,7 @@
#include <openssl/err.h>
#include <openssl/rand.h>
#include "internal/thread_once.h"
#include "internal/providercommon.h"
#include "rand_lcl.h"
/* 440 bits from SP800-90Ar1 10.1 table 2 */
@ -307,19 +308,35 @@ int drbg_hash_init(RAND_DRBG *drbg)
EVP_MD *md;
RAND_DRBG_HASH *hash = &drbg->data.hash;
#ifndef FIPS_MODE
/* Any approved digest is allowed */
md = EVP_MD_meth_dup(EVP_get_digestbynid(drbg->type));
#else
/* TODO(3.0): Fill this out with the complete list of allowed digests */
/*
* Confirm digest is allowed. Outside FIPS_MODE we allow all non-legacy
* digests. Inside FIPS_MODE we only allow approved digests. Also no XOF
* digests (such as SHAKE).
*/
switch (drbg->type) {
default:
return 0;
case NID_sha1:
case NID_sha224:
case NID_sha256:
md = EVP_MD_fetch(drbg->libctx, "SHA256", "");
case NID_sha384:
case NID_sha512:
case NID_sha512_224:
case NID_sha512_256:
case NID_sha3_224:
case NID_sha3_256:
case NID_sha3_384:
case NID_sha3_512:
#ifndef FIPS_MODE
case NID_blake2b512:
case NID_blake2s256:
case NID_sm3:
#endif
break;
}
#endif
md = EVP_MD_fetch(drbg->libctx, ossl_prov_util_nid_to_name(drbg->type), "");
if (md == NULL)
return 0;