openssl-engine-0.9.6 merge

1 files changed, 57 insertions, 0 deletions

diff --git a/src/lib/libcrypto/rand/rand_egd.c b/src/lib/libcrypto/rand/rand_egd.c
index 380c7828c3..02a0d86fa3 100644
--- a/src/lib/libcrypto/rand/rand_egd.c
+++ b/src/lib/libcrypto/rand/rand_egd.c
@@ -64,6 +64,11 @@ int RAND_egd(const char *path)
         {
         return(-1);
         }
+
+int RAND_egd_bytes(const char *path,int bytes)
+        {
+        return(-1);
+        }
 #else
 #include <openssl/opensslconf.h>
 #include OPENSSL_UNISTD
@@ -107,4 +112,56 @@ int RAND_egd(const char *path)
         if (fd != -1) close(fd);
         return(ret);
         }
+
+int RAND_egd_bytes(const char *path,int bytes)
+        {
+        int ret = 0;
+        struct sockaddr_un addr;
+        int len, num;
+        int fd = -1;
+        unsigned char buf[255];
+
+        memset(&addr, 0, sizeof(addr));
+        addr.sun_family = AF_UNIX;
+        if (strlen(path) > sizeof(addr.sun_path))
+                return (-1);
+        strcpy(addr.sun_path,path);
+        len = offsetof(struct sockaddr_un, sun_path) + strlen(path);
+        fd = socket(AF_UNIX, SOCK_STREAM, 0);
+        if (fd == -1) return (-1);
+        if (connect(fd, (struct sockaddr *)&addr, len) == -1) goto err;
+
+        while(bytes > 0)
+            {
+            buf[0] = 1;
+            buf[1] = bytes < 255 ? bytes : 255;
+            write(fd, buf, 2);
+            if (read(fd, buf, 1) != 1)
+                {
+                ret=-1;
+                goto err;
+                }
+            if(buf[0] == 0)
+                goto err;
+            num = read(fd, buf, buf[0]);
+            if (num < 1)
+                {
+                ret=-1;
+                goto err;
+                }
+            RAND_seed(buf, num);
+            if (RAND_status() != 1)
+                {
+                ret=-1;
+                goto err;
+                }
+            ret += num;
+            bytes-=num;
+            }
+ err:
+        if (fd != -1) close(fd);
+        return(ret);
+        }
+
+
 #endif