aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/rand
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/rand')
-rw-r--r--crypto/rand/md_rand.c133
-rw-r--r--crypto/rand/rand.h28
-rw-r--r--crypto/rand/rand_egd.c2
-rw-r--r--crypto/rand/rand_err.c5
-rw-r--r--crypto/rand/rand_lib.c7
-rw-r--r--crypto/rand/randfile.c48
6 files changed, 51 insertions, 172 deletions
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index da4258c479c..6b158f03495 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -55,59 +55,6 @@
* 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
- * [email protected].
- *
- * 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
- * ([email protected]). This product includes software written by Tim
- * Hudson ([email protected]).
- *
- */
#define ENTROPY_NEEDED 16 /* require 128 bits = 16 bytes of randomness */
@@ -183,10 +130,6 @@
#include <openssl/rand.h>
-#ifdef BN_DEBUG
-# define PREDICT
-#endif
-
/* #define NORAND 1 */
/* #define PREDICT 1 */
@@ -198,10 +141,6 @@ static long md_count[2]={0,0};
static double entropy=0;
static int initialized=0;
-#ifdef PREDICT
-int rand_predictable=0;
-#endif
-
const char *RAND_version="RAND" OPENSSL_VERSION_PTEXT;
static void ssleay_rand_cleanup(void);
@@ -209,7 +148,6 @@ static void ssleay_rand_seed(const void *buf, int num);
static void ssleay_rand_add(const void *buf, int num, double add_entropy);
static int ssleay_rand_bytes(unsigned char *buf, int num);
static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num);
-static int ssleay_rand_status(void);
RAND_METHOD rand_ssleay_meth={
ssleay_rand_seed,
@@ -217,7 +155,6 @@ RAND_METHOD rand_ssleay_meth={
ssleay_rand_cleanup,
ssleay_rand_add,
ssleay_rand_pseudo_bytes,
- ssleay_rand_status
};
RAND_METHOD *RAND_SSLeay(void)
@@ -369,10 +306,6 @@ static void ssleay_rand_initialize(void)
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
@@ -421,14 +354,13 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
#endif
#ifdef PREDICT
- if (rand_predictable)
- {
- static unsigned char val=0;
+ {
+ static unsigned char val=0;
- for (i=0; i<num; i++)
- buf[i]=val++;
- return(1);
- }
+ for (i=0; i<num; i++)
+ buf[i]=val++;
+ return(1);
+ }
#endif
/*
@@ -557,66 +489,17 @@ static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num)
return (ret);
}
-static int ssleay_rand_status(void)
+int RAND_status(void)
{
- int ret;
-
- CRYPTO_w_lock(CRYPTO_LOCK_RAND);
-
if (!initialized)
ssleay_rand_initialize();
- ret = entropy >= ENTROPY_NEEDED;
-
- CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
-
- return ret;
+ return (entropy >= ENTROPY_NEEDED);
}
#ifdef WINDOWS
#include <windows.h>
#include <openssl/rand.h>
-int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam)
- {
- double add_entropy=0;
- SYSTEMTIME t;
-
- switch (iMsg)
- {
- case WM_KEYDOWN:
- {
- static WPARAM key;
- if (key != wParam)
- add_entropy = 0.05;
- key = wParam;
- }
- break;
- case WM_MOUSEMOVE:
- {
- static int lastx,lasty,lastdx,lastdy;
- int x,y,dx,dy;
-
- x=LOWORD(lParam);
- y=HIWORD(lParam);
- dx=lastx-x;
- dy=lasty-y;
- if (dx != 0 && dy != 0 && dx-lastdx != 0 && dy-lastdy != 0)
- add_entropy=.2;
- lastx=x, lasty=y;
- lastdx=dx, lastdy=dy;
- }
- break;
- }
-
- GetSystemTime(&t);
- RAND_add(&iMsg, sizeof(iMsg), add_entropy);
- RAND_add(&wParam, sizeof(wParam), 0);
- RAND_add(&lParam, sizeof(lParam), 0);
- RAND_add(&t, sizeof(t), 0);
-
- return (RAND_status());
- }
-
/*****************************************************************************
* Initialisation function for the SSL random generator. Takes the contents
* of the screen as random seed.
diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index b4b12c2d744..28f45ec0526 100644
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -70,13 +70,8 @@ typedef struct rand_meth_st
void (*cleanup)(void);
void (*add)(const void *buf, int num, double entropy);
int (*pseudorand)(unsigned char *buf, int num);
- int (*status)(void);
} RAND_METHOD;
-#ifdef BN_DEBUG
-extern int rand_predictable;
-#endif
-
void RAND_set_rand_method(RAND_METHOD *meth);
RAND_METHOD *RAND_get_rand_method(void );
RAND_METHOD *RAND_SSLeay(void);
@@ -90,26 +85,10 @@ int RAND_write_file(const char *file);
const char *RAND_file_name(char *file,int num);
int RAND_status(void);
int RAND_egd(const char *path);
-void ERR_load_RAND_strings(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#ifdef WINDOWS
void RAND_screen(void);
-int RAND_event(UINT, WPARAM, LPARAM);
-
-#ifdef __cplusplus
-}
-#endif
#endif
+void ERR_load_RAND_strings(void);
/* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes
@@ -124,5 +103,8 @@ int RAND_event(UINT, WPARAM, LPARAM);
/* Reason codes. */
#define RAND_R_PRNG_NOT_SEEDED 100
+#ifdef __cplusplus
+}
+#endif
#endif
diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c
index 380c7828c30..d834408bd4e 100644
--- a/crypto/rand/rand_egd.c
+++ b/crypto/rand/rand_egd.c
@@ -97,7 +97,7 @@ int RAND_egd(const char *path)
buf[1] = 255;
write(fd, buf, 2);
if (read(fd, buf, 1) != 1) goto err;
- if (buf[0] == 0) goto err;
+ if (buf[0] == 0) goto err;
num = read(fd, buf, 255);
if (num < 1) goto err;
RAND_seed(buf, num);
diff --git a/crypto/rand/rand_err.c b/crypto/rand/rand_err.c
index 1af0aa0b8ac..d1263edf80f 100644
--- a/crypto/rand/rand_err.c
+++ b/crypto/rand/rand_err.c
@@ -54,8 +54,7 @@
*/
/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
+ * made to it will be overwritten when the script next updates this file.
*/
#include <stdio.h>
@@ -72,7 +71,7 @@ static ERR_STRING_DATA RAND_str_functs[]=
static ERR_STRING_DATA RAND_str_reasons[]=
{
-{RAND_R_PRNG_NOT_SEEDED ,"PRNG not seeded"},
+{RAND_R_PRNG_NOT_SEEDED ,"prng not seeded"},
{0,NULL}
};
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 7da74aab0ef..b09a300c46e 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -108,10 +108,3 @@ int RAND_pseudo_bytes(unsigned char *buf, int num)
return rand_meth->pseudorand(buf,num);
return(-1);
}
-
-int RAND_status(void)
- {
- if (rand_meth != NULL)
- return rand_meth->status();
- return 0;
- }
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index d01b9852e94..658a8d6b65f 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -133,20 +133,35 @@ int RAND_write_file(const char *file)
int i,ret=0,err=0;
FILE *out = NULL;
int n;
-
-#if defined(O_CREAT) && !defined(WIN32)
- /* For some reason Win32 can't write to files created this way */
-
- /* chmod(..., 0600) is too late to protect the file,
- * permissions should be restrictive from the start */
- int fd = open(file, O_CREAT, 0600);
- if (fd != -1)
- out = fdopen(fd, "wb");
+
+#ifdef VMS
+ /* Under VMS, fopen(file, "wb") will create a new version of the
+ same file. This is not good, so let's try updating an existing
+ one, and create file only if it doesn't already exist. */
+ /* At the same time, if we just update a file, we also need to
+ truncate it, and unfortunately, ftruncate() and truncate() do
+ not exist everywhere. All that remains is to delete old versions
+ of the random data file (done at the end). */
+#if 0
+ out=fopen(file,"rb+");
+ if (out == NULL && errno != ENOENT)
+ goto err;
+#endif
#endif
+
if (out == NULL)
- out = fopen(file,"wb");
+ {
+#if defined O_CREAT && defined O_EXCL
+ /* chmod(..., 0600) is too late to protect the file,
+ * permissions should be restrictive from the start */
+ int fd = open(file, O_CREAT | O_EXCL, 0600);
+ if (fd != -1)
+ out = fdopen(fd, "wb");
+#else
+ out=fopen(file,"wb");
+#endif
+ }
if (out == NULL) goto err;
-
#ifndef NO_CHMOD
chmod(file,0600);
#endif
@@ -165,8 +180,14 @@ int RAND_write_file(const char *file)
}
ret+=i;
if (n <= 0) break;
- }
+ }
#ifdef VMS
+ /* We may have updated an existing file using mode "rb+",
+ * now remove any old extra bytes */
+#if 0
+ if (ret > 0)
+ ftruncate(fileno(out), ret);
+#else
/* Try to delete older versions of the file, until there aren't
any */
{
@@ -184,7 +205,8 @@ int RAND_write_file(const char *file)
some point... */
}
}
-#endif /* VMS */
+#endif
+#endif
fclose(out);
memset(buf,0,BUFSIZE);
generated by cgit (git 2.51.2) at 2026-10-25 15:04:41 +0100