Move RNG initialization to RAND_poll(), and shared definitions to
rand_lcl.h
This commit is contained in:
Ulf Möller
parent
c0722725f9
commit
8ad7635ec9
@ -109,8 +109,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#define ENTROPY_NEEDED 20 /* require 160 bits = 20 bytes of randomness */
|
||||
|
||||
#ifdef MD_RAND_DEBUG
|
||||
# ifndef NDEBUG
|
||||
# define NDEBUG
|
||||
@ -119,75 +117,20 @@
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "openssl/e_os.h"
|
||||
|
||||
#include <openssl/rand.h>
|
||||
#include "rand_lcl.h"
|
||||
|
||||
#include <openssl/crypto.h>
|
||||
#include <openssl/err.h>
|
||||
|
||||
#if !defined(USE_MD5_RAND) && !defined(USE_SHA1_RAND) && !defined(USE_MDC2_RAND) && !defined(USE_MD2_RAND)
|
||||
#if !defined(NO_SHA) && !defined(NO_SHA1)
|
||||
#define USE_SHA1_RAND
|
||||
#elif !defined(NO_MD5)
|
||||
#define USE_MD5_RAND
|
||||
#elif !defined(NO_MDC2) && !defined(NO_DES)
|
||||
#define USE_MDC2_RAND
|
||||
#elif !defined(NO_MD2)
|
||||
#define USE_MD2_RAND
|
||||
#else
|
||||
#error No message digest algorithm available
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Changed how the state buffer used. I now attempt to 'wrap' such
|
||||
* that I don't run over the same locations the next time go through
|
||||
* the 1023 bytes - many thanks to
|
||||
* Robert J. LeBlanc <rjl@renaissoft.com> for his comments
|
||||
*/
|
||||
|
||||
#if defined(USE_MD5_RAND)
|
||||
#include <openssl/md5.h>
|
||||
#define MD_DIGEST_LENGTH MD5_DIGEST_LENGTH
|
||||
#define MD_CTX MD5_CTX
|
||||
#define MD_Init(a) MD5_Init(a)
|
||||
#define MD_Update(a,b,c) MD5_Update(a,b,c)
|
||||
#define MD_Final(a,b) MD5_Final(a,b)
|
||||
#define MD(a,b,c) MD5(a,b,c)
|
||||
#elif defined(USE_SHA1_RAND)
|
||||
#include <openssl/sha.h>
|
||||
#define MD_DIGEST_LENGTH SHA_DIGEST_LENGTH
|
||||
#define MD_CTX SHA_CTX
|
||||
#define MD_Init(a) SHA1_Init(a)
|
||||
#define MD_Update(a,b,c) SHA1_Update(a,b,c)
|
||||
#define MD_Final(a,b) SHA1_Final(a,b)
|
||||
#define MD(a,b,c) SHA1(a,b,c)
|
||||
#elif defined(USE_MDC2_RAND)
|
||||
#include <openssl/mdc2.h>
|
||||
#define MD_DIGEST_LENGTH MDC2_DIGEST_LENGTH
|
||||
#define MD_CTX MDC2_CTX
|
||||
#define MD_Init(a) MDC2_Init(a)
|
||||
#define MD_Update(a,b,c) MDC2_Update(a,b,c)
|
||||
#define MD_Final(a,b) MDC2_Final(a,b)
|
||||
#define MD(a,b,c) MDC2(a,b,c)
|
||||
#elif defined(USE_MD2_RAND)
|
||||
#include <openssl/md2.h>
|
||||
#define MD_DIGEST_LENGTH MD2_DIGEST_LENGTH
|
||||
#define MD_CTX MD2_CTX
|
||||
#define MD_Init(a) MD2_Init(a)
|
||||
#define MD_Update(a,b,c) MD2_Update(a,b,c)
|
||||
#define MD_Final(a,b) MD2_Final(a,b)
|
||||
#define MD(a,b,c) MD2(a,b,c)
|
||||
#endif
|
||||
|
||||
#include <openssl/rand.h>
|
||||
|
||||
#ifdef BN_DEBUG
|
||||
# define PREDICT
|
||||
#endif
|
||||
|
||||
/* #define NORAND 1 */
|
||||
/* #define PREDICT 1 */
|
||||
|
||||
#define STATE_SIZE 1023
|
||||
@ -243,10 +186,6 @@ static void ssleay_rand_add(const void *buf, int num, double add)
|
||||
unsigned char local_md[MD_DIGEST_LENGTH];
|
||||
MD_CTX m;
|
||||
|
||||
#ifdef NORAND
|
||||
return;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* (Based on the rand(3) manpage)
|
||||
*
|
||||
@ -359,56 +298,6 @@ static void ssleay_rand_seed(const void *buf, int num)
|
||||
ssleay_rand_add(buf, num, num);
|
||||
}
|
||||
|
||||
static void ssleay_rand_initialize(void) /* not exported in RAND_METHOD */
|
||||
{
|
||||
unsigned long l;
|
||||
#ifndef GETPID_IS_MEANINGLESS
|
||||
pid_t curr_pid = getpid();
|
||||
#endif
|
||||
#ifdef DEVRANDOM
|
||||
FILE *fh;
|
||||
#endif
|
||||
|
||||
#ifdef NORAND
|
||||
return;
|
||||
#endif
|
||||
|
||||
CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
|
||||
/* put in some default random data, we need more than just this */
|
||||
#ifndef GETPID_IS_MEANINGLESS
|
||||
l=curr_pid;
|
||||
RAND_add(&l,sizeof(l),0);
|
||||
l=getuid();
|
||||
RAND_add(&l,sizeof(l),0);
|
||||
#endif
|
||||
l=time(NULL);
|
||||
RAND_add(&l,sizeof(l),0);
|
||||
|
||||
#ifdef DEVRANDOM
|
||||
/* Use a random entropy pool device. Linux, FreeBSD and OpenBSD
|
||||
* have this. Use /dev/urandom if you can as /dev/random may block
|
||||
* if it runs out of random entries. */
|
||||
|
||||
if ((fh = fopen(DEVRANDOM, "r")) != NULL)
|
||||
{
|
||||
unsigned char tmpbuf[ENTROPY_NEEDED];
|
||||
int n;
|
||||
|
||||
setvbuf(fh, NULL, _IONBF, 0);
|
||||
n=fread((unsigned char *)tmpbuf,1,ENTROPY_NEEDED,fh);
|
||||
fclose(fh);
|
||||
RAND_add(tmpbuf,sizeof tmpbuf,n);
|
||||
memset(tmpbuf,0,n);
|
||||
}
|
||||
#endif
|
||||
#ifdef PURIFY
|
||||
memset(state,0,STATE_SIZE);
|
||||
memset(md,0,MD_DIGEST_LENGTH);
|
||||
#endif
|
||||
CRYPTO_w_lock(CRYPTO_LOCK_RAND);
|
||||
initialized=1;
|
||||
}
|
||||
|
||||
static int ssleay_rand_bytes(unsigned char *buf, int num)
|
||||
{
|
||||
static volatile int stirred_pool = 0;
|
||||
@ -452,11 +341,12 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
|
||||
* global 'md'.
|
||||
*/
|
||||
|
||||
if (!initialized)
|
||||
RAND_poll();
|
||||
|
||||
CRYPTO_w_lock(CRYPTO_LOCK_RAND);
|
||||
|
||||
if (!initialized)
|
||||
ssleay_rand_initialize();
|
||||
|
||||
initialized = 1;
|
||||
if (!stirred_pool)
|
||||
do_stir_pool = 1;
|
||||
|
||||
@ -598,12 +488,12 @@ static int ssleay_rand_status(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
CRYPTO_w_lock(CRYPTO_LOCK_RAND);
|
||||
|
||||
if (!initialized)
|
||||
ssleay_rand_initialize();
|
||||
ret = entropy >= ENTROPY_NEEDED;
|
||||
RAND_poll();
|
||||
|
||||
CRYPTO_w_lock(CRYPTO_LOCK_RAND);
|
||||
initialized = 1;
|
||||
ret = entropy >= ENTROPY_NEEDED;
|
||||
CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
|
||||
|
||||
return ret;
|
||||
|
||||
184
crypto/rand/rand_lcl.h
Normal file
184
crypto/rand/rand_lcl.h
Normal file
@ -0,0 +1,184 @@
|
||||
/* crypto/rand/md_rand.c */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* "This product includes cryptographic software written by
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
* [including the GNU Public Licence.]
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. All advertising materials mentioning features or use of this
|
||||
* software must display the following acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
||||
*
|
||||
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
||||
* endorse or promote products derived from this software without
|
||||
* prior written permission. For written permission, please contact
|
||||
* openssl-core@openssl.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "OpenSSL"
|
||||
* nor may "OpenSSL" appear in their names without prior written
|
||||
* permission of the OpenSSL Project.
|
||||
*
|
||||
* 6. Redistributions of any form whatsoever must retain the following
|
||||
* acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
||||
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
* This product includes cryptographic software written by Eric Young
|
||||
* (eay@cryptsoft.com). This product includes software written by Tim
|
||||
* Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef HEADER_RAND_LCL_H
|
||||
#define HEADER_RAND_LCL_H
|
||||
|
||||
#define ENTROPY_NEEDED 20 /* require 160 bits = 20 bytes of randomness */
|
||||
|
||||
|
||||
#if !defined(USE_MD5_RAND) && !defined(USE_SHA1_RAND) && !defined(USE_MDC2_RAND) && !defined(USE_MD2_RAND)
|
||||
#if !defined(NO_SHA) && !defined(NO_SHA1)
|
||||
#define USE_SHA1_RAND
|
||||
#elif !defined(NO_MD5)
|
||||
#define USE_MD5_RAND
|
||||
#elif !defined(NO_MDC2) && !defined(NO_DES)
|
||||
#define USE_MDC2_RAND
|
||||
#elif !defined(NO_MD2)
|
||||
#define USE_MD2_RAND
|
||||
#else
|
||||
#error No message digest algorithm available
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(USE_MD5_RAND)
|
||||
#include <openssl/md5.h>
|
||||
#define MD_DIGEST_LENGTH MD5_DIGEST_LENGTH
|
||||
#define MD(a,b,c) MD5(a,b,c)
|
||||
#elif defined(USE_SHA1_RAND)
|
||||
#include <openssl/sha.h>
|
||||
#define MD_DIGEST_LENGTH SHA_DIGEST_LENGTH
|
||||
#define MD(a,b,c) SHA1(a,b,c)
|
||||
#elif defined(USE_MDC2_RAND)
|
||||
#include <openssl/mdc2.h>
|
||||
#define MD_DIGEST_LENGTH MDC2_DIGEST_LENGTH
|
||||
#define MD(a,b,c) MDC2(a,b,c)
|
||||
#elif defined(USE_MD2_RAND)
|
||||
#include <openssl/md2.h>
|
||||
#define MD_DIGEST_LENGTH MD2_DIGEST_LENGTH
|
||||
#define MD(a,b,c) MD2(a,b,c)
|
||||
#endif
|
||||
#if defined(USE_MD5_RAND)
|
||||
#include <openssl/md5.h>
|
||||
#define MD_DIGEST_LENGTH MD5_DIGEST_LENGTH
|
||||
#define MD_CTX MD5_CTX
|
||||
#define MD_Init(a) MD5_Init(a)
|
||||
#define MD_Update(a,b,c) MD5_Update(a,b,c)
|
||||
#define MD_Final(a,b) MD5_Final(a,b)
|
||||
#define MD(a,b,c) MD5(a,b,c)
|
||||
#elif defined(USE_SHA1_RAND)
|
||||
#include <openssl/sha.h>
|
||||
#define MD_DIGEST_LENGTH SHA_DIGEST_LENGTH
|
||||
#define MD_CTX SHA_CTX
|
||||
#define MD_Init(a) SHA1_Init(a)
|
||||
#define MD_Update(a,b,c) SHA1_Update(a,b,c)
|
||||
#define MD_Final(a,b) SHA1_Final(a,b)
|
||||
#define MD(a,b,c) SHA1(a,b,c)
|
||||
#elif defined(USE_MDC2_RAND)
|
||||
#include <openssl/mdc2.h>
|
||||
#define MD_DIGEST_LENGTH MDC2_DIGEST_LENGTH
|
||||
#define MD_CTX MDC2_CTX
|
||||
#define MD_Init(a) MDC2_Init(a)
|
||||
#define MD_Update(a,b,c) MDC2_Update(a,b,c)
|
||||
#define MD_Final(a,b) MDC2_Final(a,b)
|
||||
#define MD(a,b,c) MDC2(a,b,c)
|
||||
#elif defined(USE_MD2_RAND)
|
||||
#include <openssl/md2.h>
|
||||
#define MD_DIGEST_LENGTH MD2_DIGEST_LENGTH
|
||||
#define MD_CTX MD2_CTX
|
||||
#define MD_Init(a) MD2_Init(a)
|
||||
#define MD_Update(a,b,c) MD2_Update(a,b,c)
|
||||
#define MD_Final(a,b) MD2_Final(a,b)
|
||||
#define MD(a,b,c) MD2(a,b,c)
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user