2016-05-17 18:52:22 +00:00
|
|
|
/*
|
2018-02-03 21:33:19 +00:00
|
|
|
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
1998-12-21 11:00:56 +00:00
|
|
|
*
|
2016-05-17 18:52:22 +00:00
|
|
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
|
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
|
|
* in the file LICENSE in the source distribution or at
|
|
|
|
* https://www.openssl.org/source/license.html
|
1998-12-21 11:00:56 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <time.h>
|
2015-05-14 14:56:48 +00:00
|
|
|
#include "internal/cryptlib.h"
|
2016-01-05 04:00:33 +00:00
|
|
|
#include <openssl/opensslconf.h>
|
2017-07-20 14:20:47 +00:00
|
|
|
#include "internal/rand_int.h"
|
2016-03-18 18:30:20 +00:00
|
|
|
#include <openssl/engine.h>
|
2017-04-06 09:30:03 +00:00
|
|
|
#include "internal/thread_once.h"
|
2017-06-22 13:21:43 +00:00
|
|
|
#include "rand_lcl.h"
|
2017-11-17 14:00:35 +00:00
|
|
|
#include "e_os.h"
|
1998-12-21 11:00:56 +00:00
|
|
|
|
2003-01-30 17:39:26 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2001-09-25 20:23:40 +00:00
|
|
|
/* non-NULL if default_RAND_meth is ENGINE-provided */
|
2017-06-22 13:21:43 +00:00
|
|
|
static ENGINE *funct_ref;
|
|
|
|
static CRYPTO_RWLOCK *rand_engine_lock;
|
2003-01-30 17:39:26 +00:00
|
|
|
#endif
|
2017-06-22 13:21:43 +00:00
|
|
|
static CRYPTO_RWLOCK *rand_meth_lock;
|
|
|
|
static const RAND_METHOD *default_RAND_meth;
|
|
|
|
static CRYPTO_ONCE rand_init = CRYPTO_ONCE_STATIC_INIT;
|
2017-08-31 21:16:22 +00:00
|
|
|
|
2017-08-06 22:12:28 +00:00
|
|
|
int rand_fork_count;
|
2017-04-06 09:30:03 +00:00
|
|
|
|
2018-04-10 08:22:52 +00:00
|
|
|
static CRYPTO_RWLOCK *rand_nonce_lock;
|
|
|
|
static int rand_nonce_count;
|
|
|
|
|
2018-08-21 20:51:28 +00:00
|
|
|
static int rand_cleaning_up = 0;
|
|
|
|
|
2017-07-18 13:39:21 +00:00
|
|
|
#ifdef OPENSSL_RAND_SEED_RDTSC
|
|
|
|
/*
|
|
|
|
* IMPORTANT NOTE: It is not currently possible to use this code
|
2017-08-07 23:21:36 +00:00
|
|
|
* because we are not sure about the amount of randomness it provides.
|
|
|
|
* Some SP900 tests have been run, but there is internal skepticism.
|
2017-07-18 13:39:21 +00:00
|
|
|
* So for now this code is not used.
|
|
|
|
*/
|
|
|
|
# error "RDTSC enabled? Should not be possible!"
|
|
|
|
|
|
|
|
/*
|
2017-08-31 21:16:22 +00:00
|
|
|
* Acquire entropy from high-speed clock
|
|
|
|
*
|
2017-07-18 13:39:21 +00:00
|
|
|
* Since we get some randomness from the low-order bits of the
|
2017-08-31 21:16:22 +00:00
|
|
|
* high-speed clock, it can help.
|
|
|
|
*
|
|
|
|
* Returns the total entropy count, if it exceeds the requested
|
|
|
|
* entropy count. Otherwise, returns an entropy count of 0.
|
2017-07-18 13:39:21 +00:00
|
|
|
*/
|
2017-08-31 21:16:22 +00:00
|
|
|
size_t rand_acquire_entropy_from_tsc(RAND_POOL *pool)
|
2017-07-18 13:39:21 +00:00
|
|
|
{
|
|
|
|
unsigned char c;
|
|
|
|
int i;
|
|
|
|
|
2017-08-07 23:21:36 +00:00
|
|
|
if ((OPENSSL_ia32cap_P[0] & (1 << 4)) != 0) {
|
|
|
|
for (i = 0; i < TSC_READ_COUNT; i++) {
|
|
|
|
c = (unsigned char)(OPENSSL_rdtsc() & 0xFF);
|
2018-03-05 22:45:44 +00:00
|
|
|
rand_pool_add(pool, &c, 1, 4);
|
2017-08-07 23:21:36 +00:00
|
|
|
}
|
2017-07-18 13:39:21 +00:00
|
|
|
}
|
2018-03-05 22:45:44 +00:00
|
|
|
return rand_pool_entropy_available(pool);
|
2017-07-18 13:39:21 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef OPENSSL_RAND_SEED_RDCPU
|
2017-08-31 21:16:22 +00:00
|
|
|
size_t OPENSSL_ia32_rdseed_bytes(unsigned char *buf, size_t len);
|
|
|
|
size_t OPENSSL_ia32_rdrand_bytes(unsigned char *buf, size_t len);
|
2017-07-18 13:39:21 +00:00
|
|
|
|
|
|
|
extern unsigned int OPENSSL_ia32cap_P[];
|
|
|
|
|
2017-08-31 21:16:22 +00:00
|
|
|
/*
|
|
|
|
* Acquire entropy using Intel-specific cpu instructions
|
|
|
|
*
|
|
|
|
* Uses the RDSEED instruction if available, otherwise uses
|
|
|
|
* RDRAND if available.
|
|
|
|
*
|
|
|
|
* For the differences between RDSEED and RDRAND, and why RDSEED
|
|
|
|
* is the preferred choice, see https://goo.gl/oK3KcN
|
|
|
|
*
|
|
|
|
* Returns the total entropy count, if it exceeds the requested
|
|
|
|
* entropy count. Otherwise, returns an entropy count of 0.
|
|
|
|
*/
|
|
|
|
size_t rand_acquire_entropy_from_cpu(RAND_POOL *pool)
|
2017-07-18 13:39:21 +00:00
|
|
|
{
|
2017-08-31 21:16:22 +00:00
|
|
|
size_t bytes_needed;
|
|
|
|
unsigned char *buffer;
|
|
|
|
|
2018-05-02 04:24:20 +00:00
|
|
|
bytes_needed = rand_pool_bytes_needed(pool, 1 /*entropy_factor*/);
|
2017-08-31 21:16:22 +00:00
|
|
|
if (bytes_needed > 0) {
|
2018-03-05 22:45:44 +00:00
|
|
|
buffer = rand_pool_add_begin(pool, bytes_needed);
|
2017-08-31 21:16:22 +00:00
|
|
|
|
|
|
|
if (buffer != NULL) {
|
2018-04-04 16:31:50 +00:00
|
|
|
/* Whichever comes first, use RDSEED, RDRAND or nothing */
|
2017-08-31 21:16:22 +00:00
|
|
|
if ((OPENSSL_ia32cap_P[2] & (1 << 18)) != 0) {
|
|
|
|
if (OPENSSL_ia32_rdseed_bytes(buffer, bytes_needed)
|
2018-04-04 16:31:50 +00:00
|
|
|
== bytes_needed) {
|
|
|
|
rand_pool_add_end(pool, bytes_needed, 8 * bytes_needed);
|
|
|
|
}
|
|
|
|
} else if ((OPENSSL_ia32cap_P[1] & (1 << (62 - 32))) != 0) {
|
2017-08-31 21:16:22 +00:00
|
|
|
if (OPENSSL_ia32_rdrand_bytes(buffer, bytes_needed)
|
2018-04-04 16:31:50 +00:00
|
|
|
== bytes_needed) {
|
|
|
|
rand_pool_add_end(pool, bytes_needed, 8 * bytes_needed);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
rand_pool_add_end(pool, 0, 0);
|
2017-08-31 21:16:22 +00:00
|
|
|
}
|
2017-08-07 23:21:36 +00:00
|
|
|
}
|
2017-07-18 13:39:21 +00:00
|
|
|
}
|
|
|
|
|
2018-03-05 22:45:44 +00:00
|
|
|
return rand_pool_entropy_available(pool);
|
2017-07-18 13:39:21 +00:00
|
|
|
}
|
|
|
|
#endif
|
2017-06-22 13:21:43 +00:00
|
|
|
|
2017-08-03 13:23:28 +00:00
|
|
|
|
|
|
|
/*
|
2017-08-31 21:16:22 +00:00
|
|
|
* Implements the get_entropy() callback (see RAND_DRBG_set_callbacks())
|
|
|
|
*
|
|
|
|
* If the DRBG has a parent, then the required amount of entropy input
|
|
|
|
* is fetched using the parent's RAND_DRBG_generate().
|
2017-08-03 13:23:28 +00:00
|
|
|
*
|
2017-08-31 21:16:22 +00:00
|
|
|
* Otherwise, the entropy is polled from the system entropy sources
|
2018-03-05 22:45:44 +00:00
|
|
|
* using rand_pool_acquire_entropy().
|
2017-08-31 21:16:22 +00:00
|
|
|
*
|
|
|
|
* If a random pool has been added to the DRBG using RAND_add(), then
|
|
|
|
* its entropy will be used up first.
|
2017-08-03 13:23:28 +00:00
|
|
|
*/
|
2017-08-31 21:16:22 +00:00
|
|
|
size_t rand_drbg_get_entropy(RAND_DRBG *drbg,
|
2018-02-18 18:26:55 +00:00
|
|
|
unsigned char **pout,
|
|
|
|
int entropy, size_t min_len, size_t max_len,
|
|
|
|
int prediction_resistance)
|
2017-08-03 13:23:28 +00:00
|
|
|
{
|
2017-08-31 21:16:22 +00:00
|
|
|
size_t ret = 0;
|
|
|
|
size_t entropy_available = 0;
|
2018-03-04 12:23:05 +00:00
|
|
|
RAND_POOL *pool;
|
|
|
|
|
|
|
|
if (drbg->parent && drbg->strength > drbg->parent->strength) {
|
|
|
|
/*
|
|
|
|
* We currently don't support the algorithm from NIST SP 800-90C
|
|
|
|
* 10.1.2 to use a weaker DRBG as source
|
|
|
|
*/
|
|
|
|
RANDerr(RAND_F_RAND_DRBG_GET_ENTROPY, RAND_R_PARENT_STRENGTH_TOO_WEAK);
|
|
|
|
return 0;
|
|
|
|
}
|
2017-08-03 13:23:28 +00:00
|
|
|
|
2018-10-09 23:53:29 +00:00
|
|
|
if (drbg->pool != NULL) {
|
|
|
|
pool = drbg->pool;
|
|
|
|
pool->entropy_requested = entropy;
|
|
|
|
} else {
|
|
|
|
pool = rand_pool_new(entropy, min_len, max_len);
|
2018-10-23 14:30:20 +00:00
|
|
|
if (pool == NULL)
|
|
|
|
return 0;
|
2017-08-03 13:23:28 +00:00
|
|
|
}
|
|
|
|
|
2017-08-31 21:16:22 +00:00
|
|
|
if (drbg->parent) {
|
2018-05-02 04:24:20 +00:00
|
|
|
size_t bytes_needed = rand_pool_bytes_needed(pool, 1 /*entropy_factor*/);
|
2018-03-05 22:45:44 +00:00
|
|
|
unsigned char *buffer = rand_pool_add_begin(pool, bytes_needed);
|
2017-08-22 22:24:23 +00:00
|
|
|
|
2017-08-31 21:16:22 +00:00
|
|
|
if (buffer != NULL) {
|
|
|
|
size_t bytes = 0;
|
2017-08-03 13:23:28 +00:00
|
|
|
|
2017-10-11 17:25:26 +00:00
|
|
|
/*
|
|
|
|
* Get random from parent, include our state as additional input.
|
|
|
|
* Our lock is already held, but we need to lock our parent before
|
2018-02-08 15:40:32 +00:00
|
|
|
* generating bits from it. (Note: taking the lock will be a no-op
|
|
|
|
* if locking if drbg->parent->lock == NULL.)
|
2017-10-11 17:25:26 +00:00
|
|
|
*/
|
2018-02-15 09:29:56 +00:00
|
|
|
rand_drbg_lock(drbg->parent);
|
2017-08-31 21:16:22 +00:00
|
|
|
if (RAND_DRBG_generate(drbg->parent,
|
|
|
|
buffer, bytes_needed,
|
2018-02-18 19:55:28 +00:00
|
|
|
prediction_resistance,
|
2018-07-25 01:08:48 +00:00
|
|
|
NULL, 0) != 0)
|
2017-08-31 21:16:22 +00:00
|
|
|
bytes = bytes_needed;
|
2018-10-14 10:35:19 +00:00
|
|
|
drbg->reseed_next_counter
|
|
|
|
= tsan_load(&drbg->parent->reseed_prop_counter);
|
2018-02-15 09:29:56 +00:00
|
|
|
rand_drbg_unlock(drbg->parent);
|
2017-08-03 13:23:28 +00:00
|
|
|
|
2018-04-04 16:31:50 +00:00
|
|
|
rand_pool_add_end(pool, bytes, 8 * bytes);
|
|
|
|
entropy_available = rand_pool_entropy_available(pool);
|
2017-08-31 21:16:22 +00:00
|
|
|
}
|
2017-08-27 15:46:33 +00:00
|
|
|
|
2017-08-31 21:16:22 +00:00
|
|
|
} else {
|
2018-02-18 19:55:28 +00:00
|
|
|
if (prediction_resistance) {
|
|
|
|
/*
|
|
|
|
* We don't have any entropy sources that comply with the NIST
|
|
|
|
* standard to provide prediction resistance (see NIST SP 800-90C,
|
|
|
|
* Section 5.4).
|
|
|
|
*/
|
|
|
|
RANDerr(RAND_F_RAND_DRBG_GET_ENTROPY,
|
|
|
|
RAND_R_PREDICTION_RESISTANCE_NOT_SUPPORTED);
|
2018-04-08 10:09:10 +00:00
|
|
|
goto err;
|
2018-02-18 19:55:28 +00:00
|
|
|
}
|
|
|
|
|
2017-08-31 21:16:22 +00:00
|
|
|
/* Get entropy by polling system entropy sources. */
|
2018-03-05 22:45:44 +00:00
|
|
|
entropy_available = rand_pool_acquire_entropy(pool);
|
2017-08-03 13:23:28 +00:00
|
|
|
}
|
|
|
|
|
2017-08-31 21:16:22 +00:00
|
|
|
if (entropy_available > 0) {
|
2018-03-05 22:45:44 +00:00
|
|
|
ret = rand_pool_length(pool);
|
|
|
|
*pout = rand_pool_detach(pool);
|
2017-08-25 21:26:53 +00:00
|
|
|
}
|
2017-08-31 21:16:22 +00:00
|
|
|
|
2018-04-08 10:09:10 +00:00
|
|
|
err:
|
2018-10-26 19:06:14 +00:00
|
|
|
if (drbg->pool == NULL)
|
|
|
|
rand_pool_free(pool);
|
2017-08-31 21:16:22 +00:00
|
|
|
return ret;
|
2017-08-03 13:23:28 +00:00
|
|
|
}
|
|
|
|
|
2018-02-05 21:17:31 +00:00
|
|
|
/*
|
2018-04-10 08:22:52 +00:00
|
|
|
* Implements the cleanup_entropy() callback (see RAND_DRBG_set_callbacks())
|
2018-02-18 17:39:19 +00:00
|
|
|
*
|
2018-02-05 21:17:31 +00:00
|
|
|
*/
|
2018-04-10 08:22:52 +00:00
|
|
|
void rand_drbg_cleanup_entropy(RAND_DRBG *drbg,
|
|
|
|
unsigned char *out, size_t outlen)
|
2018-02-05 21:17:31 +00:00
|
|
|
{
|
2018-10-09 23:53:29 +00:00
|
|
|
if (drbg->pool == NULL)
|
|
|
|
OPENSSL_secure_clear_free(out, outlen);
|
2018-04-10 08:22:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Implements the get_nonce() callback (see RAND_DRBG_set_callbacks())
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
size_t rand_drbg_get_nonce(RAND_DRBG *drbg,
|
|
|
|
unsigned char **pout,
|
|
|
|
int entropy, size_t min_len, size_t max_len)
|
|
|
|
{
|
|
|
|
size_t ret = 0;
|
|
|
|
RAND_POOL *pool;
|
|
|
|
|
|
|
|
struct {
|
|
|
|
void * instance;
|
|
|
|
int count;
|
|
|
|
} data = { 0 };
|
|
|
|
|
|
|
|
pool = rand_pool_new(0, min_len, max_len);
|
|
|
|
if (pool == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (rand_pool_add_nonce_data(pool) == 0)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
data.instance = drbg;
|
|
|
|
CRYPTO_atomic_add(&rand_nonce_count, 1, &data.count, rand_nonce_lock);
|
|
|
|
|
|
|
|
if (rand_pool_add(pool, (unsigned char *)&data, sizeof(data), 0) == 0)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
ret = rand_pool_length(pool);
|
|
|
|
*pout = rand_pool_detach(pool);
|
|
|
|
|
|
|
|
err:
|
|
|
|
rand_pool_free(pool);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Implements the cleanup_nonce() callback (see RAND_DRBG_set_callbacks())
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
void rand_drbg_cleanup_nonce(RAND_DRBG *drbg,
|
|
|
|
unsigned char *out, size_t outlen)
|
|
|
|
{
|
|
|
|
OPENSSL_secure_clear_free(out, outlen);
|
2018-02-05 21:17:31 +00:00
|
|
|
}
|
|
|
|
|
2017-11-17 14:00:35 +00:00
|
|
|
/*
|
|
|
|
* Generate additional data that can be used for the drbg. The data does
|
|
|
|
* not need to contain entropy, but it's useful if it contains at least
|
|
|
|
* some bits that are unpredictable.
|
|
|
|
*
|
|
|
|
* Returns 0 on failure.
|
|
|
|
*
|
|
|
|
* On success it allocates a buffer at |*pout| and returns the length of
|
|
|
|
* the data. The buffer should get freed using OPENSSL_secure_clear_free().
|
|
|
|
*/
|
|
|
|
size_t rand_drbg_get_additional_data(unsigned char **pout, size_t max_len)
|
|
|
|
{
|
2018-04-10 08:22:52 +00:00
|
|
|
size_t ret = 0;
|
2017-11-17 14:00:35 +00:00
|
|
|
RAND_POOL *pool;
|
|
|
|
|
2018-03-05 22:45:44 +00:00
|
|
|
pool = rand_pool_new(0, 0, max_len);
|
2017-11-17 14:00:35 +00:00
|
|
|
if (pool == NULL)
|
|
|
|
return 0;
|
|
|
|
|
2018-04-10 08:22:52 +00:00
|
|
|
if (rand_pool_add_additional_data(pool) == 0)
|
|
|
|
goto err;
|
2017-11-17 14:00:35 +00:00
|
|
|
|
2018-04-10 08:22:52 +00:00
|
|
|
ret = rand_pool_length(pool);
|
|
|
|
*pout = rand_pool_detach(pool);
|
2017-11-17 14:00:35 +00:00
|
|
|
|
2018-04-10 08:22:52 +00:00
|
|
|
err:
|
2018-03-05 22:45:44 +00:00
|
|
|
rand_pool_free(pool);
|
2017-11-17 14:00:35 +00:00
|
|
|
|
2018-04-10 08:22:52 +00:00
|
|
|
return ret;
|
2017-11-17 14:00:35 +00:00
|
|
|
}
|
2017-08-31 21:16:22 +00:00
|
|
|
|
2018-04-10 08:22:52 +00:00
|
|
|
void rand_drbg_cleanup_additional_data(unsigned char *out, size_t outlen)
|
2017-08-03 13:23:28 +00:00
|
|
|
{
|
2017-08-31 21:16:22 +00:00
|
|
|
OPENSSL_secure_clear_free(out, outlen);
|
2017-08-02 18:00:52 +00:00
|
|
|
}
|
|
|
|
|
2018-05-09 15:09:50 +00:00
|
|
|
void rand_fork(void)
|
2017-08-06 22:12:28 +00:00
|
|
|
{
|
|
|
|
rand_fork_count++;
|
|
|
|
}
|
|
|
|
|
2017-06-22 13:21:43 +00:00
|
|
|
DEFINE_RUN_ONCE_STATIC(do_rand_init)
|
2017-04-06 09:30:03 +00:00
|
|
|
{
|
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
Revert the crypto "global lock" implementation
Conceptually, this is a squashed version of:
Revert "Address feedback"
This reverts commit 75551e07bd2339dfea06ef1d31d69929e13a4495.
and
Revert "Add CRYPTO_thread_glock_new"
This reverts commit ed6b2c7938ec6f07b15745d4183afc276e74c6dd.
But there were some intervening commits that made neither revert apply
cleanly, so instead do it all as one shot.
The crypto global locks were an attempt to cope with the awkward
POSIX semantics for pthread_atfork(); its documentation (the "RATIONALE"
section) indicates that the expected usage is to have the prefork handler
lock all "global" locks, and the parent and child handlers release those
locks, to ensure that forking happens with a consistent (lock) state.
However, the set of functions available in the child process is limited
to async-signal-safe functions, and pthread_mutex_unlock() is not on
the list of async-signal-safe functions! The only synchronization
primitives that are async-signal-safe are the semaphore primitives,
which are not really appropriate for general-purpose usage.
However, the state consistency problem that the global locks were
attempting to solve is not actually a serious problem, particularly for
OpenSSL. That is, we can consider four cases of forking application
that might use OpenSSL:
(1) Single-threaded, does not call into OpenSSL in the child (e.g.,
the child calls exec() immediately)
For this class of process, no locking is needed at all, since there is
only ever a single thread of execution and the only reentrancy is due to
signal handlers (which are themselves limited to async-signal-safe
operation and should not be doing much work at all).
(2) Single-threaded, calls into OpenSSL after fork()
The application must ensure that it does not fork() with an unexpected
lock held (that is, one that would get unlocked in the parent but
accidentally remain locked in the child and cause deadlock). Since
OpenSSL does not expose any of its internal locks to the application
and the application is single-threaded, the OpenSSL internal locks
will be unlocked for the fork(), and the state will be consistent.
(OpenSSL will need to reseed its PRNG in the child, but that is
an orthogonal issue.) If the application makes use of locks from
libcrypto, proper handling for those locks is the responsibility of
the application, as for any other locking primitive that is available
for application programming.
(3) Multi-threaded, does not call into OpenSSL after fork()
As for (1), the OpenSSL state is only relevant in the parent, so
no particular fork()-related handling is needed. The internal locks
are relevant, but there is no interaction with the child to consider.
(4) Multi-threaded, calls into OpenSSL after fork()
This is the case where the pthread_atfork() hooks to ensure that all
global locks are in a known state across fork() would come into play,
per the above discussion. However, these "calls into OpenSSL after
fork()" are still subject to the restriction to async-signal-safe
functions. Since OpenSSL uses all sorts of locking and libc functions
that are not on the list of safe functions (e.g., malloc()), this
case is not currently usable and is unlikely to ever be usable,
independently of the locking situation. So, there is no need to
go through contortions to attempt to support this case in the one small
area of locking interaction with fork().
In light of the above analysis (thanks @davidben and @achernya), go
back to the simpler implementation that does not need to distinguish
"library-global" locks or to have complicated atfork handling for locks.
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5089)
2018-01-16 15:49:54 +00:00
|
|
|
rand_engine_lock = CRYPTO_THREAD_lock_new();
|
2018-04-28 18:35:54 +00:00
|
|
|
if (rand_engine_lock == NULL)
|
|
|
|
return 0;
|
2017-04-06 09:30:03 +00:00
|
|
|
#endif
|
2018-04-28 18:35:54 +00:00
|
|
|
|
Revert the crypto "global lock" implementation
Conceptually, this is a squashed version of:
Revert "Address feedback"
This reverts commit 75551e07bd2339dfea06ef1d31d69929e13a4495.
and
Revert "Add CRYPTO_thread_glock_new"
This reverts commit ed6b2c7938ec6f07b15745d4183afc276e74c6dd.
But there were some intervening commits that made neither revert apply
cleanly, so instead do it all as one shot.
The crypto global locks were an attempt to cope with the awkward
POSIX semantics for pthread_atfork(); its documentation (the "RATIONALE"
section) indicates that the expected usage is to have the prefork handler
lock all "global" locks, and the parent and child handlers release those
locks, to ensure that forking happens with a consistent (lock) state.
However, the set of functions available in the child process is limited
to async-signal-safe functions, and pthread_mutex_unlock() is not on
the list of async-signal-safe functions! The only synchronization
primitives that are async-signal-safe are the semaphore primitives,
which are not really appropriate for general-purpose usage.
However, the state consistency problem that the global locks were
attempting to solve is not actually a serious problem, particularly for
OpenSSL. That is, we can consider four cases of forking application
that might use OpenSSL:
(1) Single-threaded, does not call into OpenSSL in the child (e.g.,
the child calls exec() immediately)
For this class of process, no locking is needed at all, since there is
only ever a single thread of execution and the only reentrancy is due to
signal handlers (which are themselves limited to async-signal-safe
operation and should not be doing much work at all).
(2) Single-threaded, calls into OpenSSL after fork()
The application must ensure that it does not fork() with an unexpected
lock held (that is, one that would get unlocked in the parent but
accidentally remain locked in the child and cause deadlock). Since
OpenSSL does not expose any of its internal locks to the application
and the application is single-threaded, the OpenSSL internal locks
will be unlocked for the fork(), and the state will be consistent.
(OpenSSL will need to reseed its PRNG in the child, but that is
an orthogonal issue.) If the application makes use of locks from
libcrypto, proper handling for those locks is the responsibility of
the application, as for any other locking primitive that is available
for application programming.
(3) Multi-threaded, does not call into OpenSSL after fork()
As for (1), the OpenSSL state is only relevant in the parent, so
no particular fork()-related handling is needed. The internal locks
are relevant, but there is no interaction with the child to consider.
(4) Multi-threaded, calls into OpenSSL after fork()
This is the case where the pthread_atfork() hooks to ensure that all
global locks are in a known state across fork() would come into play,
per the above discussion. However, these "calls into OpenSSL after
fork()" are still subject to the restriction to async-signal-safe
functions. Since OpenSSL uses all sorts of locking and libc functions
that are not on the list of safe functions (e.g., malloc()), this
case is not currently usable and is unlikely to ever be usable,
independently of the locking situation. So, there is no need to
go through contortions to attempt to support this case in the one small
area of locking interaction with fork().
In light of the above analysis (thanks @davidben and @achernya), go
back to the simpler implementation that does not need to distinguish
"library-global" locks or to have complicated atfork handling for locks.
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5089)
2018-01-16 15:49:54 +00:00
|
|
|
rand_meth_lock = CRYPTO_THREAD_lock_new();
|
2018-04-28 18:35:54 +00:00
|
|
|
if (rand_meth_lock == NULL)
|
|
|
|
goto err1;
|
2017-08-03 13:23:28 +00:00
|
|
|
|
2018-04-10 08:22:52 +00:00
|
|
|
rand_nonce_lock = CRYPTO_THREAD_lock_new();
|
2018-04-28 18:35:54 +00:00
|
|
|
if (rand_nonce_lock == NULL)
|
|
|
|
goto err2;
|
2018-04-10 08:22:52 +00:00
|
|
|
|
2018-08-21 20:51:28 +00:00
|
|
|
if (!rand_cleaning_up && !rand_pool_init())
|
2018-06-06 23:31:44 +00:00
|
|
|
goto err3;
|
|
|
|
|
2018-04-28 18:35:54 +00:00
|
|
|
return 1;
|
|
|
|
|
2018-06-06 23:31:44 +00:00
|
|
|
err3:
|
|
|
|
rand_pool_cleanup();
|
2018-04-28 18:35:54 +00:00
|
|
|
err2:
|
|
|
|
CRYPTO_THREAD_lock_free(rand_meth_lock);
|
|
|
|
rand_meth_lock = NULL;
|
|
|
|
err1:
|
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
|
|
CRYPTO_THREAD_lock_free(rand_engine_lock);
|
|
|
|
rand_engine_lock = NULL;
|
|
|
|
#endif
|
|
|
|
return 0;
|
2017-04-06 09:30:03 +00:00
|
|
|
}
|
1998-12-21 11:00:56 +00:00
|
|
|
|
2017-06-22 13:21:43 +00:00
|
|
|
void rand_cleanup_int(void)
|
|
|
|
{
|
|
|
|
const RAND_METHOD *meth = default_RAND_meth;
|
|
|
|
|
2018-08-21 20:51:28 +00:00
|
|
|
rand_cleaning_up = 1;
|
|
|
|
|
2017-06-22 13:21:43 +00:00
|
|
|
if (meth != NULL && meth->cleanup != NULL)
|
|
|
|
meth->cleanup();
|
|
|
|
RAND_set_rand_method(NULL);
|
2018-08-21 20:51:28 +00:00
|
|
|
rand_pool_cleanup();
|
2017-06-22 13:21:43 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
|
|
CRYPTO_THREAD_lock_free(rand_engine_lock);
|
2018-04-28 18:35:54 +00:00
|
|
|
rand_engine_lock = NULL;
|
2017-06-22 13:21:43 +00:00
|
|
|
#endif
|
|
|
|
CRYPTO_THREAD_lock_free(rand_meth_lock);
|
2018-04-28 18:35:54 +00:00
|
|
|
rand_meth_lock = NULL;
|
2018-04-10 08:22:52 +00:00
|
|
|
CRYPTO_THREAD_lock_free(rand_nonce_lock);
|
2018-04-28 18:35:54 +00:00
|
|
|
rand_nonce_lock = NULL;
|
2017-08-03 13:23:28 +00:00
|
|
|
}
|
|
|
|
|
2018-06-06 23:31:44 +00:00
|
|
|
/*
|
|
|
|
* RAND_close_seed_files() ensures that any seed file decriptors are
|
|
|
|
* closed after use.
|
|
|
|
*/
|
|
|
|
void RAND_keep_random_devices_open(int keep)
|
|
|
|
{
|
|
|
|
rand_pool_keep_random_devices_open(keep);
|
|
|
|
}
|
|
|
|
|
2017-08-03 13:23:28 +00:00
|
|
|
/*
|
2017-08-31 21:16:22 +00:00
|
|
|
* RAND_poll() reseeds the default RNG using random input
|
|
|
|
*
|
|
|
|
* The random input is obtained from polling various entropy
|
|
|
|
* sources which depend on the operating system and are
|
|
|
|
* configurable via the --with-rand-seed configure option.
|
|
|
|
*/
|
|
|
|
int RAND_poll(void)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
RAND_POOL *pool = NULL;
|
|
|
|
|
|
|
|
const RAND_METHOD *meth = RAND_get_rand_method();
|
|
|
|
|
|
|
|
if (meth == RAND_OpenSSL()) {
|
2017-11-24 13:59:58 +00:00
|
|
|
/* fill random pool and seed the master DRBG */
|
|
|
|
RAND_DRBG *drbg = RAND_DRBG_get0_master();
|
2017-08-31 21:16:22 +00:00
|
|
|
|
|
|
|
if (drbg == NULL)
|
|
|
|
return 0;
|
|
|
|
|
2018-02-15 09:29:56 +00:00
|
|
|
rand_drbg_lock(drbg);
|
2017-08-31 21:16:22 +00:00
|
|
|
ret = rand_drbg_restart(drbg, NULL, 0, 0);
|
2018-02-15 09:29:56 +00:00
|
|
|
rand_drbg_unlock(drbg);
|
2017-08-31 21:16:22 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
/* fill random pool and seed the current legacy RNG */
|
2018-03-05 22:45:44 +00:00
|
|
|
pool = rand_pool_new(RAND_DRBG_STRENGTH,
|
2017-08-31 21:16:22 +00:00
|
|
|
RAND_DRBG_STRENGTH / 8,
|
2018-10-09 23:53:29 +00:00
|
|
|
RAND_POOL_MAX_LENGTH);
|
2017-08-31 21:16:22 +00:00
|
|
|
if (pool == NULL)
|
|
|
|
return 0;
|
|
|
|
|
2018-03-05 22:45:44 +00:00
|
|
|
if (rand_pool_acquire_entropy(pool) == 0)
|
2017-08-31 21:16:22 +00:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (meth->add == NULL
|
2018-03-05 22:45:44 +00:00
|
|
|
|| meth->add(rand_pool_buffer(pool),
|
|
|
|
rand_pool_length(pool),
|
|
|
|
(rand_pool_entropy(pool) / 8.0)) == 0)
|
2017-08-31 21:16:22 +00:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
err:
|
2018-03-05 22:45:44 +00:00
|
|
|
rand_pool_free(pool);
|
2017-08-31 21:16:22 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate memory and initialize a new random pool
|
|
|
|
*/
|
|
|
|
|
2018-10-09 23:53:29 +00:00
|
|
|
RAND_POOL *rand_pool_new(int entropy_requested, size_t min_len, size_t max_len)
|
2017-08-03 13:23:28 +00:00
|
|
|
{
|
2017-08-31 21:16:22 +00:00
|
|
|
RAND_POOL *pool = OPENSSL_zalloc(sizeof(*pool));
|
|
|
|
|
|
|
|
if (pool == NULL) {
|
|
|
|
RANDerr(RAND_F_RAND_POOL_NEW, ERR_R_MALLOC_FAILURE);
|
2018-10-09 23:53:29 +00:00
|
|
|
return NULL;
|
2017-08-31 21:16:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pool->min_len = min_len;
|
2018-10-09 23:53:29 +00:00
|
|
|
pool->max_len = (max_len > RAND_POOL_MAX_LENGTH) ?
|
|
|
|
RAND_POOL_MAX_LENGTH : max_len;
|
2017-08-31 21:16:22 +00:00
|
|
|
|
|
|
|
pool->buffer = OPENSSL_secure_zalloc(pool->max_len);
|
|
|
|
if (pool->buffer == NULL) {
|
|
|
|
RANDerr(RAND_F_RAND_POOL_NEW, ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2018-10-09 23:53:29 +00:00
|
|
|
pool->entropy_requested = entropy_requested;
|
2017-08-31 21:16:22 +00:00
|
|
|
|
|
|
|
return pool;
|
|
|
|
|
|
|
|
err:
|
|
|
|
OPENSSL_free(pool);
|
|
|
|
return NULL;
|
2017-08-03 13:23:28 +00:00
|
|
|
}
|
|
|
|
|
2018-10-09 23:53:29 +00:00
|
|
|
/*
|
|
|
|
* Attach new random pool to the given buffer
|
|
|
|
*
|
|
|
|
* This function is intended to be used only for feeding random data
|
|
|
|
* provided by RAND_add() and RAND_seed() into the <master> DRBG.
|
|
|
|
*/
|
|
|
|
RAND_POOL *rand_pool_attach(const unsigned char *buffer, size_t len,
|
|
|
|
size_t entropy)
|
|
|
|
{
|
|
|
|
RAND_POOL *pool = OPENSSL_zalloc(sizeof(*pool));
|
|
|
|
|
|
|
|
if (pool == NULL) {
|
|
|
|
RANDerr(RAND_F_RAND_POOL_ATTACH, ERR_R_MALLOC_FAILURE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The const needs to be cast away, but attached buffers will not be
|
|
|
|
* modified (in contrary to allocated buffers which are zeroed and
|
|
|
|
* freed in the end).
|
|
|
|
*/
|
|
|
|
pool->buffer = (unsigned char *) buffer;
|
|
|
|
pool->len = len;
|
|
|
|
|
|
|
|
pool->attached = 1;
|
|
|
|
|
|
|
|
pool->min_len = pool->max_len = pool->len;
|
|
|
|
pool->entropy = entropy;
|
|
|
|
|
|
|
|
return pool;
|
|
|
|
}
|
|
|
|
|
2017-08-31 21:16:22 +00:00
|
|
|
/*
|
|
|
|
* Free |pool|, securely erasing its buffer.
|
|
|
|
*/
|
2018-03-05 22:45:44 +00:00
|
|
|
void rand_pool_free(RAND_POOL *pool)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
|
|
|
if (pool == NULL)
|
|
|
|
return;
|
|
|
|
|
2018-10-09 23:53:29 +00:00
|
|
|
/*
|
|
|
|
* Although it would be advisable from a cryptographical viewpoint,
|
|
|
|
* we are not allowed to clear attached buffers, since they are passed
|
|
|
|
* to rand_pool_attach() as `const unsigned char*`.
|
|
|
|
* (see corresponding comment in rand_pool_attach()).
|
|
|
|
*/
|
|
|
|
if (!pool->attached)
|
|
|
|
OPENSSL_secure_clear_free(pool->buffer, pool->max_len);
|
2017-08-31 21:16:22 +00:00
|
|
|
OPENSSL_free(pool);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return the |pool|'s buffer to the caller (readonly).
|
|
|
|
*/
|
2018-03-05 22:45:44 +00:00
|
|
|
const unsigned char *rand_pool_buffer(RAND_POOL *pool)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
|
|
|
return pool->buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return the |pool|'s entropy to the caller.
|
|
|
|
*/
|
2018-03-05 22:45:44 +00:00
|
|
|
size_t rand_pool_entropy(RAND_POOL *pool)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
|
|
|
return pool->entropy;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return the |pool|'s buffer length to the caller.
|
|
|
|
*/
|
2018-03-05 22:45:44 +00:00
|
|
|
size_t rand_pool_length(RAND_POOL *pool)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
|
|
|
return pool->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Detach the |pool| buffer and return it to the caller.
|
|
|
|
* It's the responsibility of the caller to free the buffer
|
|
|
|
* using OPENSSL_secure_clear_free().
|
|
|
|
*/
|
2018-03-05 22:45:44 +00:00
|
|
|
unsigned char *rand_pool_detach(RAND_POOL *pool)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
|
|
|
unsigned char *ret = pool->buffer;
|
|
|
|
pool->buffer = NULL;
|
2018-10-26 19:06:14 +00:00
|
|
|
pool->len = 0;
|
|
|
|
pool->entropy = 0;
|
2017-08-31 21:16:22 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2018-05-02 04:24:20 +00:00
|
|
|
* If |entropy_factor| bits contain 1 bit of entropy, how many bytes does one
|
|
|
|
* need to obtain at least |bits| bits of entropy?
|
2017-08-31 21:16:22 +00:00
|
|
|
*/
|
2018-05-02 04:24:20 +00:00
|
|
|
#define ENTROPY_TO_BYTES(bits, entropy_factor) \
|
|
|
|
(((bits) * (entropy_factor) + 7) / 8)
|
2017-08-31 21:16:22 +00:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Checks whether the |pool|'s entropy is available to the caller.
|
|
|
|
* This is the case when entropy count and buffer length are high enough.
|
|
|
|
* Returns
|
|
|
|
*
|
|
|
|
* |entropy| if the entropy count and buffer size is large enough
|
|
|
|
* 0 otherwise
|
|
|
|
*/
|
2018-03-05 22:45:44 +00:00
|
|
|
size_t rand_pool_entropy_available(RAND_POOL *pool)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
2018-10-09 23:53:29 +00:00
|
|
|
if (pool->entropy < pool->entropy_requested)
|
2017-08-31 21:16:22 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (pool->len < pool->min_len)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return pool->entropy;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Returns the (remaining) amount of entropy needed to fill
|
|
|
|
* the random pool.
|
|
|
|
*/
|
|
|
|
|
2018-03-05 22:45:44 +00:00
|
|
|
size_t rand_pool_entropy_needed(RAND_POOL *pool)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
2018-10-09 23:53:29 +00:00
|
|
|
if (pool->entropy < pool->entropy_requested)
|
|
|
|
return pool->entropy_requested - pool->entropy;
|
2017-08-31 21:16:22 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Returns the number of bytes needed to fill the pool, assuming
|
2018-05-02 04:24:20 +00:00
|
|
|
* the input has 1 / |entropy_factor| entropy bits per data bit.
|
2017-08-31 21:16:22 +00:00
|
|
|
* In case of an error, 0 is returned.
|
|
|
|
*/
|
|
|
|
|
2018-05-02 04:24:20 +00:00
|
|
|
size_t rand_pool_bytes_needed(RAND_POOL *pool, unsigned int entropy_factor)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
|
|
|
size_t bytes_needed;
|
2018-03-05 22:45:44 +00:00
|
|
|
size_t entropy_needed = rand_pool_entropy_needed(pool);
|
2017-08-31 21:16:22 +00:00
|
|
|
|
2018-05-02 04:24:20 +00:00
|
|
|
if (entropy_factor < 1) {
|
2017-08-31 21:16:22 +00:00
|
|
|
RANDerr(RAND_F_RAND_POOL_BYTES_NEEDED, RAND_R_ARGUMENT_OUT_OF_RANGE);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-05-02 04:24:20 +00:00
|
|
|
bytes_needed = ENTROPY_TO_BYTES(entropy_needed, entropy_factor);
|
2017-08-31 21:16:22 +00:00
|
|
|
|
|
|
|
if (bytes_needed > pool->max_len - pool->len) {
|
|
|
|
/* not enough space left */
|
|
|
|
RANDerr(RAND_F_RAND_POOL_BYTES_NEEDED, RAND_R_RANDOM_POOL_OVERFLOW);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pool->len < pool->min_len &&
|
|
|
|
bytes_needed < pool->min_len - pool->len)
|
|
|
|
/* to meet the min_len requirement */
|
|
|
|
bytes_needed = pool->min_len - pool->len;
|
|
|
|
|
|
|
|
return bytes_needed;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns the remaining number of bytes available */
|
2018-03-05 22:45:44 +00:00
|
|
|
size_t rand_pool_bytes_remaining(RAND_POOL *pool)
|
2017-08-03 13:23:28 +00:00
|
|
|
{
|
2017-08-31 21:16:22 +00:00
|
|
|
return pool->max_len - pool->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add random bytes to the random pool.
|
|
|
|
*
|
|
|
|
* It is expected that the |buffer| contains |len| bytes of
|
|
|
|
* random input which contains at least |entropy| bits of
|
|
|
|
* randomness.
|
|
|
|
*
|
2018-04-04 16:31:50 +00:00
|
|
|
* Returns 1 if the added amount is adequate, otherwise 0
|
2017-08-31 21:16:22 +00:00
|
|
|
*/
|
2018-04-04 16:31:50 +00:00
|
|
|
int rand_pool_add(RAND_POOL *pool,
|
|
|
|
const unsigned char *buffer, size_t len, size_t entropy)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
|
|
|
if (len > pool->max_len - pool->len) {
|
|
|
|
RANDerr(RAND_F_RAND_POOL_ADD, RAND_R_ENTROPY_INPUT_TOO_LONG);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (len > 0) {
|
|
|
|
memcpy(pool->buffer + pool->len, buffer, len);
|
|
|
|
pool->len += len;
|
|
|
|
pool->entropy += entropy;
|
|
|
|
}
|
|
|
|
|
2018-04-04 16:31:50 +00:00
|
|
|
return 1;
|
2017-08-31 21:16:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Start to add random bytes to the random pool in-place.
|
|
|
|
*
|
|
|
|
* Reserves the next |len| bytes for adding random bytes in-place
|
|
|
|
* and returns a pointer to the buffer.
|
|
|
|
* The caller is allowed to copy up to |len| bytes into the buffer.
|
|
|
|
* If |len| == 0 this is considered a no-op and a NULL pointer
|
|
|
|
* is returned without producing an error message.
|
|
|
|
*
|
2018-03-05 22:45:44 +00:00
|
|
|
* After updating the buffer, rand_pool_add_end() needs to be called
|
2017-08-31 21:16:22 +00:00
|
|
|
* to finish the udpate operation (see next comment).
|
|
|
|
*/
|
2018-03-05 22:45:44 +00:00
|
|
|
unsigned char *rand_pool_add_begin(RAND_POOL *pool, size_t len)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
|
|
|
if (len == 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (len > pool->max_len - pool->len) {
|
|
|
|
RANDerr(RAND_F_RAND_POOL_ADD_BEGIN, RAND_R_RANDOM_POOL_OVERFLOW);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pool->buffer + pool->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finish to add random bytes to the random pool in-place.
|
|
|
|
*
|
|
|
|
* Finishes an in-place update of the random pool started by
|
2018-03-05 22:45:44 +00:00
|
|
|
* rand_pool_add_begin() (see previous comment).
|
2017-08-31 21:16:22 +00:00
|
|
|
* It is expected that |len| bytes of random input have been added
|
|
|
|
* to the buffer which contain at least |entropy| bits of randomness.
|
|
|
|
* It is allowed to add less bytes than originally reserved.
|
|
|
|
*/
|
2018-04-04 16:31:50 +00:00
|
|
|
int rand_pool_add_end(RAND_POOL *pool, size_t len, size_t entropy)
|
2017-08-31 21:16:22 +00:00
|
|
|
{
|
|
|
|
if (len > pool->max_len - pool->len) {
|
|
|
|
RANDerr(RAND_F_RAND_POOL_ADD_END, RAND_R_RANDOM_POOL_OVERFLOW);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (len > 0) {
|
|
|
|
pool->len += len;
|
|
|
|
pool->entropy += entropy;
|
|
|
|
}
|
|
|
|
|
2018-04-04 16:31:50 +00:00
|
|
|
return 1;
|
2017-06-22 13:21:43 +00:00
|
|
|
}
|
|
|
|
|
2001-09-25 20:23:40 +00:00
|
|
|
int RAND_set_rand_method(const RAND_METHOD *meth)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
2017-06-22 13:21:43 +00:00
|
|
|
if (!RUN_ONCE(&rand_init, do_rand_init))
|
2017-04-06 09:30:03 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
CRYPTO_THREAD_write_lock(rand_meth_lock);
|
2003-01-30 17:39:26 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2016-02-25 17:09:06 +00:00
|
|
|
ENGINE_finish(funct_ref);
|
|
|
|
funct_ref = NULL;
|
2003-01-30 17:39:26 +00:00
|
|
|
#endif
|
2015-01-22 03:40:55 +00:00
|
|
|
default_RAND_meth = meth;
|
2017-04-06 09:30:03 +00:00
|
|
|
CRYPTO_THREAD_unlock(rand_meth_lock);
|
2015-01-22 03:40:55 +00:00
|
|
|
return 1;
|
|
|
|
}
|
1998-12-21 11:00:56 +00:00
|
|
|
|
2001-04-18 04:18:16 +00:00
|
|
|
const RAND_METHOD *RAND_get_rand_method(void)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
2017-04-06 09:30:03 +00:00
|
|
|
const RAND_METHOD *tmp_meth = NULL;
|
|
|
|
|
2017-06-22 13:21:43 +00:00
|
|
|
if (!RUN_ONCE(&rand_init, do_rand_init))
|
2017-04-06 09:30:03 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
CRYPTO_THREAD_write_lock(rand_meth_lock);
|
2017-06-22 13:21:43 +00:00
|
|
|
if (default_RAND_meth == NULL) {
|
2003-01-30 17:39:26 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2017-06-22 13:21:43 +00:00
|
|
|
ENGINE *e;
|
|
|
|
|
|
|
|
/* If we have an engine that can do RAND, use it. */
|
|
|
|
if ((e = ENGINE_get_default_RAND()) != NULL
|
|
|
|
&& (tmp_meth = ENGINE_get_RAND(e)) != NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
funct_ref = e;
|
2017-06-22 13:21:43 +00:00
|
|
|
default_RAND_meth = tmp_meth;
|
|
|
|
} else {
|
|
|
|
ENGINE_finish(e);
|
2017-08-03 13:23:28 +00:00
|
|
|
default_RAND_meth = &rand_meth;
|
2017-06-22 13:21:43 +00:00
|
|
|
}
|
|
|
|
#else
|
2017-08-03 13:23:28 +00:00
|
|
|
default_RAND_meth = &rand_meth;
|
2003-01-30 17:39:26 +00:00
|
|
|
#endif
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2017-04-06 09:30:03 +00:00
|
|
|
tmp_meth = default_RAND_meth;
|
|
|
|
CRYPTO_THREAD_unlock(rand_meth_lock);
|
|
|
|
return tmp_meth;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2001-09-25 20:23:40 +00:00
|
|
|
|
2003-01-30 17:39:26 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2001-09-25 20:23:40 +00:00
|
|
|
int RAND_set_rand_engine(ENGINE *engine)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
const RAND_METHOD *tmp_meth = NULL;
|
2017-04-06 09:30:03 +00:00
|
|
|
|
2017-06-22 13:21:43 +00:00
|
|
|
if (!RUN_ONCE(&rand_init, do_rand_init))
|
2017-04-06 09:30:03 +00:00
|
|
|
return 0;
|
|
|
|
|
2017-06-22 13:21:43 +00:00
|
|
|
if (engine != NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!ENGINE_init(engine))
|
|
|
|
return 0;
|
|
|
|
tmp_meth = ENGINE_get_RAND(engine);
|
2016-02-25 17:09:06 +00:00
|
|
|
if (tmp_meth == NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
ENGINE_finish(engine);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2017-04-06 09:30:03 +00:00
|
|
|
CRYPTO_THREAD_write_lock(rand_engine_lock);
|
2015-01-22 03:40:55 +00:00
|
|
|
/* This function releases any prior ENGINE so call it first */
|
|
|
|
RAND_set_rand_method(tmp_meth);
|
|
|
|
funct_ref = engine;
|
2017-04-06 09:30:03 +00:00
|
|
|
CRYPTO_THREAD_unlock(rand_engine_lock);
|
2015-01-22 03:40:55 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2003-01-30 17:39:26 +00:00
|
|
|
#endif
|
1998-12-21 11:00:56 +00:00
|
|
|
|
2008-11-12 03:58:08 +00:00
|
|
|
void RAND_seed(const void *buf, int num)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
const RAND_METHOD *meth = RAND_get_rand_method();
|
2017-06-22 13:21:43 +00:00
|
|
|
|
|
|
|
if (meth->seed != NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
meth->seed(buf, num);
|
|
|
|
}
|
1998-12-21 11:00:56 +00:00
|
|
|
|
2017-06-22 13:21:43 +00:00
|
|
|
void RAND_add(const void *buf, int num, double randomness)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
const RAND_METHOD *meth = RAND_get_rand_method();
|
2017-06-22 13:21:43 +00:00
|
|
|
|
|
|
|
if (meth->add != NULL)
|
|
|
|
meth->add(buf, num, randomness);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2000-01-13 20:59:17 +00:00
|
|
|
|
2017-08-02 18:00:52 +00:00
|
|
|
/*
|
|
|
|
* This function is not part of RAND_METHOD, so if we're not using
|
|
|
|
* the default method, then just call RAND_bytes(). Otherwise make
|
|
|
|
* sure we're instantiated and use the private DRBG.
|
|
|
|
*/
|
|
|
|
int RAND_priv_bytes(unsigned char *buf, int num)
|
|
|
|
{
|
|
|
|
const RAND_METHOD *meth = RAND_get_rand_method();
|
2017-08-27 15:46:33 +00:00
|
|
|
RAND_DRBG *drbg;
|
2017-10-11 17:25:26 +00:00
|
|
|
int ret;
|
2017-08-02 18:00:52 +00:00
|
|
|
|
|
|
|
if (meth != RAND_OpenSSL())
|
|
|
|
return RAND_bytes(buf, num);
|
|
|
|
|
2017-11-24 13:59:58 +00:00
|
|
|
drbg = RAND_DRBG_get0_private();
|
2017-08-27 15:46:33 +00:00
|
|
|
if (drbg == NULL)
|
2017-08-02 18:00:52 +00:00
|
|
|
return 0;
|
|
|
|
|
2018-02-03 21:33:19 +00:00
|
|
|
ret = RAND_DRBG_bytes(drbg, buf, num);
|
2017-10-11 17:25:26 +00:00
|
|
|
return ret;
|
2017-08-02 18:00:52 +00:00
|
|
|
}
|
|
|
|
|
2008-11-12 03:58:08 +00:00
|
|
|
int RAND_bytes(unsigned char *buf, int num)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
const RAND_METHOD *meth = RAND_get_rand_method();
|
2017-06-22 13:21:43 +00:00
|
|
|
|
|
|
|
if (meth->bytes != NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
return meth->bytes(buf, num);
|
2017-06-19 16:58:06 +00:00
|
|
|
RANDerr(RAND_F_RAND_BYTES, RAND_R_FUNC_NOT_IMPLEMENTED);
|
2017-06-22 13:21:43 +00:00
|
|
|
return -1;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
1998-12-21 11:00:56 +00:00
|
|
|
|
2016-01-05 04:00:33 +00:00
|
|
|
#if OPENSSL_API_COMPAT < 0x10100000L
|
2008-11-12 03:58:08 +00:00
|
|
|
int RAND_pseudo_bytes(unsigned char *buf, int num)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
const RAND_METHOD *meth = RAND_get_rand_method();
|
2017-06-22 13:21:43 +00:00
|
|
|
|
|
|
|
if (meth->pseudorand != NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
return meth->pseudorand(buf, num);
|
2017-06-22 13:21:43 +00:00
|
|
|
return -1;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2015-02-26 13:52:30 +00:00
|
|
|
#endif
|
2000-03-02 14:34:58 +00:00
|
|
|
|
|
|
|
int RAND_status(void)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
const RAND_METHOD *meth = RAND_get_rand_method();
|
2017-06-22 13:21:43 +00:00
|
|
|
|
|
|
|
if (meth->status != NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
return meth->status();
|
|
|
|
return 0;
|
|
|
|
}
|