projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRNGT: continuous DRBG tests for providers
[openssl.git]
/
crypto
/
rand
/
drbg_lib.c
diff --git
a/crypto/rand/drbg_lib.c
b/crypto/rand/drbg_lib.c
index c3f3b4ebe743bd1eb43f95a448eeb3d748b9c2b8..94a4e98d73aedb153b9cf42f716d8cf080eecccc 100644
(file)
--- a/
crypto/rand/drbg_lib.c
+++ b/
crypto/rand/drbg_lib.c
@@
-14,6
+14,7
@@
#include "rand_local.h"
#include "internal/thread_once.h"
#include "crypto/rand.h"
#include "rand_local.h"
#include "internal/thread_once.h"
#include "crypto/rand.h"
+#include "crypto/rand_pool.h"
#include "crypto/cryptlib.h"
/*
#include "crypto/cryptlib.h"
/*
@@
-161,7
+162,7
@@
static void *drbg_ossl_ctx_new(OPENSSL_CTX *libctx)
if (dgbl == NULL)
return NULL;
if (dgbl == NULL)
return NULL;
-#ifndef FIPS_MODE
+#ifndef FIPS_MOD
UL
E
/*
* We need to ensure that base libcrypto thread handling has been
* initialised.
/*
* We need to ensure that base libcrypto thread handling has been
* initialised.
@@
-468,13
+469,8
@@
static RAND_DRBG *rand_drbg_new(OPENSSL_CTX *ctx,
drbg->parent = parent;
if (parent == NULL) {
drbg->parent = parent;
if (parent == NULL) {
-#ifdef FIPS_MODE
- drbg->get_entropy = rand_crngt_get_entropy;
- drbg->cleanup_entropy = rand_crngt_cleanup_entropy;
-#else
drbg->get_entropy = rand_drbg_get_entropy;
drbg->cleanup_entropy = rand_drbg_cleanup_entropy;
drbg->get_entropy = rand_drbg_get_entropy;
drbg->cleanup_entropy = rand_drbg_cleanup_entropy;
-#endif
#ifndef RAND_DRBG_GET_RANDOM_NONCE
drbg->get_nonce = rand_drbg_get_nonce;
drbg->cleanup_nonce = rand_drbg_cleanup_nonce;
#ifndef RAND_DRBG_GET_RANDOM_NONCE
drbg->get_nonce = rand_drbg_get_nonce;
drbg->cleanup_nonce = rand_drbg_cleanup_nonce;
@@
-552,7
+548,7
@@
void RAND_DRBG_free(RAND_DRBG *drbg)
drbg->meth->uninstantiate(drbg);
rand_pool_free(drbg->adin_pool);
CRYPTO_THREAD_lock_free(drbg->lock);
drbg->meth->uninstantiate(drbg);
rand_pool_free(drbg->adin_pool);
CRYPTO_THREAD_lock_free(drbg->lock);
-#ifndef FIPS_MODE
+#ifndef FIPS_MOD
UL
E
CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RAND_DRBG, drbg, &drbg->ex_data);
#endif
CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RAND_DRBG, drbg, &drbg->ex_data);
#endif
@@
-1143,7
+1139,7
@@
int rand_drbg_enable_locking(RAND_DRBG *drbg)
return 1;
}
return 1;
}
-#ifndef FIPS_MODE
+#ifndef FIPS_MOD
UL
E
/*
* Get and set the EXDATA
*/
/*
* Get and set the EXDATA
*/
@@
-1287,7
+1283,7
@@
static int drbg_add(const void *buf, int num, double randomness)
buflen = (size_t)num;
buflen = (size_t)num;
-#ifdef FIPS_MODE
+#ifdef FIPS_MOD
UL
E
/*
* NIST SP-800-90A mandates that entropy *shall not* be provided
* by the consuming application. By setting the randomness to zero,
/*
* NIST SP-800-90A mandates that entropy *shall not* be provided
* by the consuming application. By setting the randomness to zero,
@@
-1458,7
+1454,7
@@
RAND_METHOD rand_meth = {
RAND_METHOD *RAND_OpenSSL(void)
{
RAND_METHOD *RAND_OpenSSL(void)
{
-#ifndef FIPS_MODE
+#ifndef FIPS_MOD
UL
E
return &rand_meth;
#else
return NULL;
return &rand_meth;
#else
return NULL;