4 files changed, 249 insertions, 78 deletions

diff --git a/src/lib/libcrypto/rand/rand.h b/src/lib/libcrypto/rand/rand.h
index 477d7a150a..e17aa7a9f7 100644
--- a/src/lib/libcrypto/rand/rand.h
+++ b/src/lib/libcrypto/rand/rand.h
@@ -59,34 +59,68 @@
 #ifndef HEADER_RAND_H
 #define HEADER_RAND_H
 
+#include <stdlib.h>
+#include <openssl/ossl_typ.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-#ifndef NOPROTO
+typedef struct rand_meth_st
+        {
+        void (*seed)(const void *buf, int num);
+        int (*bytes)(unsigned char *buf, int num);
+        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
+
+int RAND_set_rand_method(const RAND_METHOD *meth);
+const RAND_METHOD *RAND_get_rand_method(void);
+int RAND_set_rand_engine(ENGINE *engine);
+RAND_METHOD *RAND_SSLeay(void);
 void RAND_cleanup(void );
-void RAND_bytes( unsigned char *buf,int num);
-void RAND_seed( unsigned char *buf,int num);
-int  RAND_load_file(char *file,long max_bytes);
-int  RAND_write_file(char *file);
-char *RAND_file_name(char *file,int num);
-#ifdef WINDOWS
+int  RAND_bytes(unsigned char *buf,int num);
+int  RAND_pseudo_bytes(unsigned char *buf,int num);
+void RAND_seed(const void *buf,int num);
+void RAND_add(const void *buf,int num,double entropy);
+int  RAND_load_file(const char *file,long max_bytes);
+int  RAND_write_file(const char *file);
+const char *RAND_file_name(char *file,size_t num);
+int RAND_status(void);
+int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes);
+int RAND_egd(const char *path);
+int RAND_egd_bytes(const char *path,int bytes);
+int RAND_poll(void);
+
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+
 void RAND_screen(void);
+int RAND_event(UINT, WPARAM, LPARAM);
+
 #endif
-#else
-void RAND_cleanup();
-void RAND_bytes();
-void RAND_seed();
-int  RAND_load_file();
-int  RAND_write_file();
-char *RAND_file_name();
-#ifdef WINDOWS
-void RAND_screen();
-#endif
-#endif
+
+/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+void ERR_load_RAND_strings(void);
+
+/* Error codes for the RAND functions. */
+
+/* Function codes. */
+#define RAND_F_RAND_GET_RAND_METHOD                      101
+#define RAND_F_SSLEAY_RAND_BYTES                         100
+
+/* Reason codes. */
+#define RAND_R_PRNG_NOT_SEEDED                           100
 
 #ifdef  __cplusplus
 }
 #endif
-
 #endif
diff --git a/src/lib/libcrypto/rand/rand_err.c b/src/lib/libcrypto/rand/rand_err.c
index d1263edf80..b77267e213 100644
--- a/src/lib/libcrypto/rand/rand_err.c
+++ b/src/lib/libcrypto/rand/rand_err.c
@@ -54,7 +54,8 @@
  */
 
 /* 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.
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
  */
 
 #include <stdio.h>
@@ -62,16 +63,17 @@
 #include <openssl/rand.h>
 
 /* BEGIN ERROR CODES */
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
 static ERR_STRING_DATA RAND_str_functs[]=
         {
+{ERR_PACK(0,RAND_F_RAND_GET_RAND_METHOD,0),     "RAND_get_rand_method"},
 {ERR_PACK(0,RAND_F_SSLEAY_RAND_BYTES,0),        "SSLEAY_RAND_BYTES"},
 {0,NULL}
         };
 
 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}
         };
 
@@ -84,7 +86,7 @@ void ERR_load_RAND_strings(void)
         if (init)
                 {
                 init=0;
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
                 ERR_load_strings(ERR_LIB_RAND,RAND_str_functs);
                 ERR_load_strings(ERR_LIB_RAND,RAND_str_reasons);
 #endif
diff --git a/src/lib/libcrypto/rand/rand_lib.c b/src/lib/libcrypto/rand/rand_lib.c
index 34c6d5b968..5cf5dc1188 100644
--- a/src/lib/libcrypto/rand/rand_lib.c
+++ b/src/lib/libcrypto/rand/rand_lib.c
@@ -57,42 +57,110 @@
  */
 
 #include <stdio.h>
-#include <sys/types.h>
 #include <time.h>
+#include "cryptlib.h"
 #include <openssl/rand.h>
+#include <openssl/engine.h>
 
-#ifdef NO_RAND
-static RAND_METHOD *rand_meth=NULL;
-#else
-extern RAND_METHOD rand_ssleay_meth;
-static RAND_METHOD *rand_meth= &rand_ssleay_meth;
-#endif
+/* non-NULL if default_RAND_meth is ENGINE-provided */
+static ENGINE *funct_ref =NULL;
+static const RAND_METHOD *default_RAND_meth = NULL;
 
-void RAND_set_rand_method(RAND_METHOD *meth)
+int RAND_set_rand_method(const RAND_METHOD *meth)
         {
-        rand_meth=meth;
+        if(funct_ref)
+                {
+                ENGINE_finish(funct_ref);
+                funct_ref = NULL;
+                }
+        default_RAND_meth = meth;
+        return 1;
         }
 
-RAND_METHOD *RAND_get_rand_method(void)
+const RAND_METHOD *RAND_get_rand_method(void)
         {
-        return(rand_meth);
+        if (!default_RAND_meth)
+                {
+                ENGINE *e = ENGINE_get_default_RAND();
+                if(e)
+                        {
+                        default_RAND_meth = ENGINE_get_RAND(e);
+                        if(!default_RAND_meth)
+                                {
+                                ENGINE_finish(e);
+                                e = NULL;
+                                }
+                        }
+                if(e)
+                        funct_ref = e;
+                else
+                        default_RAND_meth = RAND_SSLeay();
+                }
+        return default_RAND_meth;
+        }
+
+int RAND_set_rand_engine(ENGINE *engine)
+        {
+        const RAND_METHOD *tmp_meth = NULL;
+        if(engine)
+                {
+                if(!ENGINE_init(engine))
+                        return 0;
+                tmp_meth = ENGINE_get_RAND(engine);
+                if(!tmp_meth)
+                        {
+                        ENGINE_finish(engine);
+                        return 0;
+                        }
+                }
+        /* This function releases any prior ENGINE so call it first */
+        RAND_set_rand_method(tmp_meth);
+        funct_ref = engine;
+        return 1;
         }
 
 void RAND_cleanup(void)
         {
-        if (rand_meth != NULL)
-                rand_meth->cleanup();
+        const RAND_METHOD *meth = RAND_get_rand_method();
+        if (meth && meth->cleanup)
+                meth->cleanup();
+        RAND_set_rand_method(NULL);
         }
 
 void RAND_seed(const void *buf, int num)
         {
-        if (rand_meth != NULL)
-                rand_meth->seed(buf,num);
+        const RAND_METHOD *meth = RAND_get_rand_method();
+        if (meth && meth->seed)
+                meth->seed(buf,num);
+        }
+
+void RAND_add(const void *buf, int num, double entropy)
+        {
+        const RAND_METHOD *meth = RAND_get_rand_method();
+        if (meth && meth->add)
+                meth->add(buf,num,entropy);
         }
 
-void RAND_bytes(unsigned char *buf, int num)
+int RAND_bytes(unsigned char *buf, int num)
         {
-        if (rand_meth != NULL)
-                rand_meth->bytes(buf,num);
+        const RAND_METHOD *meth = RAND_get_rand_method();
+        if (meth && meth->bytes)
+                return meth->bytes(buf,num);
+        return(-1);
         }
 
+int RAND_pseudo_bytes(unsigned char *buf, int num)
+        {
+        const RAND_METHOD *meth = RAND_get_rand_method();
+        if (meth && meth->pseudorand)
+                return meth->pseudorand(buf,num);
+        return(-1);
+        }
+
+int RAND_status(void)
+        {
+        const RAND_METHOD *meth = RAND_get_rand_method();
+        if (meth && meth->status)
+                return meth->status();
+        return 0;
+        }
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index f2b3746363..982074c465 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -56,22 +56,41 @@
  * [including the GNU Public Licence.]
  */
 
+#include <errno.h>
 #include <stdio.h>
-#include "cryptlib.h"
-#include <sys/stat.h>
-#include <sys/types.h>
-#include "rand.h"
+#include <stdlib.h>
+#include <string.h>
+
+#include "e_os.h"
+#include <openssl/crypto.h>
+#include <openssl/rand.h>
+
+#ifdef OPENSSL_SYS_VMS
+#include <unixio.h>
+#endif
+#ifndef NO_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef MAC_OS_pre_X
+# include <stat.h>
+#else
+# include <sys/stat.h>
+#endif
 
 #undef BUFSIZE
 #define BUFSIZE 1024
 #define RAND_DATA 1024
 
-/* #define RFILE ".rand" - defined in ../../e_os.h */
+/* #define RFILE ".rnd" - defined in ../../e_os.h */
+
+/* Note that these functions are intended for seed files only.
+ * Entropy devices and EGD sockets are handled in rand_unix.c */
 
-int RAND_load_file(file,bytes)
-char *file;
-long bytes;
+int RAND_load_file(const char *file, long bytes)
         {
+        /* If bytes >= 0, read up to 'bytes' bytes.
+         * if bytes == -1, read complete file. */
+
         MS_STATIC unsigned char buf[BUFSIZE];
         struct stat sb;
         int i,ret=0,n;
@@ -81,23 +100,28 @@ long bytes;
 
         i=stat(file,&sb);
         /* If the state fails, put some crap in anyway */
-        RAND_seed((unsigned char *)&sb,sizeof(sb));
-        ret+=sizeof(sb);
+        RAND_add(&sb,sizeof(sb),0);
         if (i < 0) return(0);
-        if (bytes <= 0) return(ret);
+        if (bytes == 0) return(ret);
 
-        in=fopen(file,"r");
+        in=fopen(file,"rb");
         if (in == NULL) goto err;
         for (;;)
                 {
-                n=(bytes < BUFSIZE)?(int)bytes:BUFSIZE;
+                if (bytes > 0)
+                        n = (bytes < BUFSIZE)?(int)bytes:BUFSIZE;
+                else
+                        n = BUFSIZE;
                 i=fread(buf,1,n,in);
                 if (i <= 0) break;
                 /* even if n != i, use the full array */
-                RAND_seed(buf,n);
+                RAND_add(buf,n,i);
                 ret+=i;
-                bytes-=n;
-                if (bytes <= 0) break;
+                if (bytes > 0)
+                        {
+                        bytes-=n;
+                        if (bytes <= 0) break;
+                        }
                 }
         fclose(in);
         memset(buf,0,BUFSIZE);
@@ -105,23 +129,36 @@ err:
         return(ret);
         }
 
-int RAND_write_file(file)
-char *file;
+int RAND_write_file(const char *file)
         {
         unsigned char buf[BUFSIZE];
-        int i,ret=0;
-        FILE *out;
+        int i,ret=0,rand_err=0;
+        FILE *out = NULL;
         int n;
-
-        out=fopen(file,"w");
+        
+#if defined(O_CREAT) && !defined(OPENSSL_SYS_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");
+#endif
+        if (out == NULL)
+                out = fopen(file,"wb");
         if (out == NULL) goto err;
+
+#ifndef NO_CHMOD
         chmod(file,0600);
+#endif
         n=RAND_DATA;
         for (;;)
                 {
                 i=(n > BUFSIZE)?BUFSIZE:n;
                 n-=BUFSIZE;
-                RAND_bytes(buf,i);
+                if (RAND_bytes(buf,i) <= 0)
+                        rand_err=1;
                 i=fwrite(buf,1,i,out);
                 if (i <= 0)
                         {
@@ -130,21 +167,40 @@ char *file;
                         }
                 ret+=i;
                 if (n <= 0) break;
+                }
+#ifdef OPENSSL_SYS_VMS
+        /* Try to delete older versions of the file, until there aren't
+           any */
+        {
+        char *tmpf;
+
+        tmpf = OPENSSL_malloc(strlen(file) + 4);  /* to add ";-1" and a nul */
+        if (tmpf)
+                {
+                strcpy(tmpf, file);
+                strcat(tmpf, ";-1");
+                while(delete(tmpf) == 0)
+                        ;
+                rename(file,";1"); /* Make sure it's version 1, or we
+                                      will reach the limit (32767) at
+                                      some point... */
                 }
+        }
+#endif /* OPENSSL_SYS_VMS */
+
         fclose(out);
         memset(buf,0,BUFSIZE);
 err:
-        return(ret);
+        return (rand_err ? -1 : ret);
         }
 
-char *RAND_file_name(buf,size)
-char *buf;
-int size;
+const char *RAND_file_name(char *buf, size_t size)
         {
-        char *s;
+        char *s=NULL;
         char *ret=NULL;
 
-        s=getenv("RANDFILE");
+        if (OPENSSL_issetugid() == 0)
+                s=getenv("RANDFILE");
         if (s != NULL)
                 {
                 strncpy(buf,s,size-1);
@@ -153,14 +209,25 @@ int size;
                 }
         else
                 {
-                s=getenv("HOME");
-                if (s == NULL) return(RFILE);
-                if (((int)(strlen(s)+strlen(RFILE)+2)) > size)
-                        return(RFILE);
-                strcpy(buf,s);
-                strcat(buf,"/");
-                strcat(buf,RFILE);
-                ret=buf;
+                if (OPENSSL_issetugid() == 0)
+                        s=getenv("HOME");
+#ifdef DEFAULT_HOME
+                if (s == NULL)
+                        {
+                        s = DEFAULT_HOME;
+                        }
+#endif
+                if (s != NULL && (strlen(s)+strlen(RFILE)+2 < size))
+                        {
+                        strcpy(buf,s);
+#ifndef OPENSSL_SYS_VMS
+                        strcat(buf,"/");
+#endif
+                        strcat(buf,RFILE);
+                        ret=buf;
+                        }
+                else
+                        buf[0] = '\0'; /* no file name */
                 }
         return(ret);
         }