Change RAND_poll for Unix to try a number of devices and only read
them for a short period of time (actually, poll them with select(), then read() whatever is there), which is about 10ms (hard-coded value) each. Separate Windows and Unixly code, and start on a VMS variant that currently just returns 0.
This commit is contained in:
Richard Levitte
parent
0b33bc65cd
commit
0c61e299b3
6
CHANGES
6
CHANGES
@ -3,6 +3,12 @@
|
|||||||
|
|
||||||
Changes between 0.9.6 and 0.9.7 [xx XXX 2000]
|
Changes between 0.9.6 and 0.9.7 [xx XXX 2000]
|
||||||
|
|
||||||
|
*) Change the Unix RAND_poll() variant to be able to poll several
|
||||||
|
random devices and only read data for a small fragment of time
|
||||||
|
to avoid hangs. Also separate out the Unix variant to it's own
|
||||||
|
file, rand_unix.c. For VMS, there's a currently-empty rand_vms.c.
|
||||||
|
[Richard Levitte]
|
||||||
|
|
||||||
*) Move OCSP client related routines to ocsp_cl.c. These
|
*) Move OCSP client related routines to ocsp_cl.c. These
|
||||||
provide utility functions which an application needing
|
provide utility functions which an application needing
|
||||||
to issue a request to an OCSP responder and analyse the
|
to issue a request to an OCSP responder and analyse the
|
||||||
|
|||||||
@ -22,8 +22,10 @@ TEST= randtest.c
|
|||||||
APPS=
|
APPS=
|
||||||
|
|
||||||
LIB=$(TOP)/libcrypto.a
|
LIB=$(TOP)/libcrypto.a
|
||||||
LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c rand_win.c
|
LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \
|
||||||
LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o rand_win.o
|
rand_win.c rand_unix.c
|
||||||
|
LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \
|
||||||
|
rand_win.o rand_unix.o
|
||||||
|
|
||||||
SRC= $(LIBSRC)
|
SRC= $(LIBSRC)
|
||||||
|
|
||||||
|
|||||||
207
crypto/rand/rand_unix.c
Normal file
207
crypto/rand/rand_unix.c
Normal file
@ -0,0 +1,207 @@
|
|||||||
|
/* crypto/rand/rand_unix.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).
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "cryptlib.h"
|
||||||
|
#include <openssl/rand.h>
|
||||||
|
#include "rand_lcl.h"
|
||||||
|
|
||||||
|
#if !(defined(WINDOWS) || defined(WIN32) || defined(VMS))
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/times.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
int RAND_poll(void)
|
||||||
|
{
|
||||||
|
unsigned long l;
|
||||||
|
pid_t curr_pid = getpid();
|
||||||
|
#ifdef DEVRANDOM
|
||||||
|
unsigned char tmpbuf[ENTROPY_NEEDED];
|
||||||
|
int n = 0;
|
||||||
|
static const char *randomfiles[] = { DEVRANDOM, NULL };
|
||||||
|
const char **randomfile = NULL;
|
||||||
|
int fd;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#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. */
|
||||||
|
|
||||||
|
for (randomfile = randomfiles; *randomfile && n < ENTROPY_NEEDED; randomfile++)
|
||||||
|
{
|
||||||
|
if ((fd = open(*randomfile, O_RDONLY|O_NONBLOCK
|
||||||
|
#ifdef O_NOCTTY /* If it happens to be a TTY (god forbid), do not make it
|
||||||
|
our controlling tty */
|
||||||
|
|O_NOCTTY
|
||||||
|
#endif
|
||||||
|
#ifdef O_NOFOLLOW /* Fail if the file is a symbolic link */
|
||||||
|
|O_NOFOLLOW
|
||||||
|
#endif
|
||||||
|
)) >= 0)
|
||||||
|
{
|
||||||
|
struct timeval t = { 0, 10*1000 }; /* Spend 10ms on
|
||||||
|
each file. */
|
||||||
|
int r;
|
||||||
|
fd_set fset;
|
||||||
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
FD_ZERO(&fset);
|
||||||
|
FD_SET(fd, &fset);
|
||||||
|
r = -1;
|
||||||
|
|
||||||
|
if (select(fd+1,&fset,NULL,NULL,&t) < 0)
|
||||||
|
t.tv_usec=0;
|
||||||
|
else if (FD_ISSET(fd, &fset))
|
||||||
|
{
|
||||||
|
r=read(fd,(unsigned char *)tmpbuf+n,
|
||||||
|
ENTROPY_NEEDED-n);
|
||||||
|
if (r > 0)
|
||||||
|
n += r;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Some Unixen will update t, some
|
||||||
|
won't. For those who won't, give
|
||||||
|
up here, otherwise, we will do
|
||||||
|
this once again for the remaining
|
||||||
|
time. */
|
||||||
|
if (t.tv_usec == 10*1000)
|
||||||
|
t.tv_usec=0;
|
||||||
|
}
|
||||||
|
while ((r > 0 || (errno == EINTR || errno == EAGAIN))
|
||||||
|
&& t.tv_usec != 0 && n < ENTROPY_NEEDED);
|
||||||
|
|
||||||
|
close(fd);
|
||||||
|
RAND_add(tmpbuf,sizeof tmpbuf,n);
|
||||||
|
memset(tmpbuf,0,n);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* put in some default random data, we need more than just this */
|
||||||
|
l=curr_pid;
|
||||||
|
RAND_add(&l,sizeof(l),0);
|
||||||
|
l=getuid();
|
||||||
|
RAND_add(&l,sizeof(l),0);
|
||||||
|
|
||||||
|
l=time(NULL);
|
||||||
|
RAND_add(&l,sizeof(l),0);
|
||||||
|
|
||||||
|
#ifdef DEVRANDOM
|
||||||
|
return 1;
|
||||||
|
#endif
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
72
crypto/rand/rand_vms.c
Normal file
72
crypto/rand/rand_vms.c
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
/* crypto/rand/rand_vms.c */
|
||||||
|
/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
|
||||||
|
* project 2000.
|
||||||
|
*/
|
||||||
|
/* ====================================================================
|
||||||
|
* 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).
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <openssl/rand.h>
|
||||||
|
#include "rand_lcl.h"
|
||||||
|
|
||||||
|
#if defined(VMS)
|
||||||
|
|
||||||
|
/* For now, this does nothing. I'm searching for a good random device,
|
||||||
|
then we'll see. */
|
||||||
|
|
||||||
|
int RAND_poll(void)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -684,53 +684,4 @@ static void readscreen(void)
|
|||||||
DeleteDC(hScrDC);
|
DeleteDC(hScrDC);
|
||||||
}
|
}
|
||||||
|
|
||||||
#else /* Unix version */
|
|
||||||
|
|
||||||
#include <time.h>
|
|
||||||
|
|
||||||
#ifdef NO_FP_API
|
|
||||||
# undef DEVRANDOM
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int RAND_poll(void)
|
|
||||||
{
|
|
||||||
unsigned long l;
|
|
||||||
pid_t curr_pid = getpid();
|
|
||||||
#ifdef DEVRANDOM
|
|
||||||
FILE *fh;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
|
||||||
|
|
||||||
/* put in some default random data, we need more than just this */
|
|
||||||
l=curr_pid;
|
|
||||||
RAND_add(&l,sizeof(l),0);
|
|
||||||
l=getuid();
|
|
||||||
RAND_add(&l,sizeof(l),0);
|
|
||||||
|
|
||||||
l=time(NULL);
|
|
||||||
RAND_add(&l,sizeof(l),0);
|
|
||||||
|
|
||||||
#ifdef DEVRANDOM
|
|
||||||
return 1;
|
|
||||||
#endif
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
8
e_os.h
8
e_os.h
@ -77,9 +77,9 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef DEVRANDOM
|
#ifndef DEVRANDOM
|
||||||
/* set this to your 'random' device if you have one.
|
/* set this to a comma-separated list of 'random' device files to try out.
|
||||||
* My default, we will try to read this file */
|
* My default, we will try to read at least one of these files */
|
||||||
#define DEVRANDOM "/dev/urandom"
|
#define DEVRANDOM "/dev/random","/dev/srandom","/dev/urandom"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__MWERKS__) && defined(macintosh)
|
#if defined(__MWERKS__) && defined(macintosh)
|
||||||
@ -245,6 +245,8 @@ extern "C" {
|
|||||||
# define RFILE ".rnd"
|
# define RFILE ".rnd"
|
||||||
# define LIST_SEPARATOR_CHAR ','
|
# define LIST_SEPARATOR_CHAR ','
|
||||||
# define NUL_DEV "NLA0:"
|
# define NUL_DEV "NLA0:"
|
||||||
|
/* We don't have any well-defined random devices on VMS, yet... */
|
||||||
|
# undef DEVRANDOM
|
||||||
/* We need to do this since VMS has the following coding on status codes:
|
/* We need to do this since VMS has the following coding on status codes:
|
||||||
|
|
||||||
Bits 0-2: status type: 0 = warning, 1 = success, 2 = error, 3 = info ...
|
Bits 0-2: status type: 0 = warning, 1 = success, 2 = error, 3 = info ...
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user