diff options
author | Matt Caswell <matt@openssl.org> | 2019-05-23 14:35:42 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2019-06-28 10:22:21 +0100 |
commit | 57ca171a131e6d55b4c4f6decefedeaa509db702 (patch) | |
tree | 69f6f52ea75f782b9a60a7702959de68a50da7d9 /test | |
parent | 0da1d43a94ffc8f2aaadcaa441f556ed54f0ecda (diff) |
Make the RAND code available from inside the FIPS module
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/9035)
Diffstat (limited to 'test')
-rw-r--r-- | test/build.info | 4 | ||||
-rw-r--r-- | test/drbgtest.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/build.info b/test/build.info index 1cf604e37e..f5b802da4d 100644 --- a/test/build.info +++ b/test/build.info @@ -371,13 +371,13 @@ IF[{- !$disabled{tests} -}] DEPEND[recordlentest]=../libcrypto ../libssl libtestutil.a SOURCE[drbgtest]=drbgtest.c - INCLUDE[drbgtest]=../include ../apps/include + INCLUDE[drbgtest]=../include ../apps/include ../crypto/include DEPEND[drbgtest]=../libcrypto.a libtestutil.a SOURCE[drbg_cavs_test]=drbg_cavs_test.c drbg_cavs_data_ctr.c \ drbg_cavs_data_hash.c drbg_cavs_data_hmac.c - INCLUDE[drbg_cavs_test]=../include ../apps/include . .. + INCLUDE[drbg_cavs_test]=../include ../apps/include . .. ../crypto/include DEPEND[drbg_cavs_test]=../libcrypto libtestutil.a SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c diff --git a/test/drbgtest.c b/test/drbgtest.c index 618403fd3a..f75c432724 100644 --- a/test/drbgtest.c +++ b/test/drbgtest.c @@ -1264,8 +1264,8 @@ static const size_t crngt_num_cases = 6; static size_t crngt_case, crngt_idx; -static int crngt_entropy_cb(OPENSSL_CTX *ctx, unsigned char *buf, - unsigned char *md, +static int crngt_entropy_cb(OPENSSL_CTX *ctx, RAND_POOL *pool, + unsigned char *buf, unsigned char *md, unsigned int *md_size) { size_t i, z; |