OpenSSL 1.1.1-pre2

crypto/rand/rand_vms.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -7,16 +7,11 @@
  * https://www.openssl.org/source/license.html
  */
 
-/*
- * Modified by VMS Software, Inc (2016)
- *    Eliminate looping through all processes (performance)
- *    Add additional randomizations using rand() function
- */
-
-#include <openssl/rand.h>
-#include "rand_lcl.h"
+#include "e_os.h"
 
 #if defined(OPENSSL_SYS_VMS)
+# include <openssl/rand.h>
+# include "rand_lcl.h"
 # include <descrip.h>
 # include <jpidef.h>
 # include <ssdef.h>
@@ -26,6 +21,10 @@
 #  pragma message disable DOLLARID
 # endif
 
+# ifndef OPENSSL_RAND_SEED_OS
+#  error "Unsupported seeding method configured; must be os"
+# endif
+
 /*
  * Use 32-bit pointers almost everywhere.  Define the type to which to cast a
  * pointer passed to an external function.
@@ -34,9 +33,9 @@
 #  define PTR_T __void_ptr64
 #  pragma pointer_size save
 #  pragma pointer_size 32
-# else                          /* __INITIAL_POINTER_SIZE == 64 */
+# else
 #  define PTR_T void *
-# endif                         /* __INITIAL_POINTER_SIZE == 64 [else] */
+# endif
 
 static struct items_data_st {
     short length, code;         /* length is number of bytes */
@@ -52,27 +51,22 @@ static struct items_data_st {
     {4, JPI$_PPGCNT},
     {4, JPI$_WSPEAK},
     {4, JPI$_FINALEXC},
-    {0, 0}                      /* zero terminated */
+    {0, 0}
 };
 
-int RAND_poll(void)
+size_t RAND_POOL_acquire_entropy(RAND_POOL *pool)
 {
-
     /* determine the number of items in the JPI array */
-
     struct items_data_st item_entry;
-    int item_entry_count = sizeof(items_data)/sizeof(item_entry);
-
+    int item_entry_count = OSSL_NELEM(items_data);
     /* Create the JPI itemlist array to hold item_data content */
-
     struct {
         short length, code;
         int *buffer;
         int *retlen;
-    } item[item_entry_count], *pitem; /* number of entries in items_data */
-
+    } item[item_entry_count], *pitem;
     struct items_data_st *pitems_data;
-    int data_buffer[(item_entry_count*2)+4]; /* 8 bytes per entry max */
+    int data_buffer[(item_entry_count * 2) + 4]; /* 8 bytes per entry max */
     int iosb[2];
     int sys_time[2];
     int *ptr;
@@ -80,54 +74,52 @@ int RAND_poll(void)
     int tmp_length   = 0;
     int total_length = 0;
 
-    pitems_data = items_data;
-    pitem = item;
-
-
     /* Setup itemlist for GETJPI */
-    while (pitems_data->length) {
+    pitems_data = items_data;
+    for (pitem = item; pitems_data->length != 0; pitem++) {
         pitem->length = pitems_data->length;
         pitem->code   = pitems_data->code;
         pitem->buffer = &data_buffer[total_length];
         pitem->retlen = 0;
         /* total_length is in longwords */
-        total_length += pitems_data->length/4;
+        total_length += pitems_data->length / 4;
         pitems_data++;
-        pitem ++;
     }
     pitem->length = pitem->code = 0;
 
     /* Fill data_buffer with various info bits from this process */
-    /* and twist that data to seed the SSL random number init    */
-
-    if (sys$getjpiw(EFN$C_ENF, NULL, NULL, item, &iosb, 0, 0) == SS$_NORMAL) {
-        for (i = 0; i < total_length; i++) {
-            sys$gettim((struct _generic_64 *)&sys_time[0]);
-            srand(sys_time[0] * data_buffer[0] * data_buffer[1] + i);
-
-            if (i == (total_length - 1)) { /* for JPI$_FINALEXC */
-                ptr = &data_buffer[i];
-                for (j = 0; j < 4; j++) {
-                    data_buffer[i + j] = ptr[j];
-                    /* OK to use rand() just to scramble the seed */
-                    data_buffer[i + j] ^= (sys_time[0] ^ rand());
-                    tmp_length++;
-                }
-            } else {
-                /* OK to use rand() just to scramble the seed */
-                data_buffer[i] ^= (sys_time[0] ^ rand());
-            }
-        }
-
-        total_length += (tmp_length - 1);
-
-        /* size of seed is total_length*4 bytes (64bytes) */
-        RAND_add((PTR_T) data_buffer, total_length*4, total_length * 2);
-    } else {
+    if (sys$getjpiw(EFN$C_ENF, NULL, NULL, item, &iosb, 0, 0) != SS$_NORMAL)
         return 0;
+
+    /* Now twist that data to seed the SSL random number init */
+    for (i = 0; i < total_length; i++) {
+        sys$gettim((struct _generic_64 *)&sys_time[0]);
+        srand(sys_time[0] * data_buffer[0] * data_buffer[1] + i);
+
+        if (i == (total_length - 1)) { /* for JPI$_FINALEXC */
+            ptr = &data_buffer[i];
+            for (j = 0; j < 4; j++) {
+                data_buffer[i + j] = ptr[j];
+                /* OK to use rand() just to scramble the seed */
+                data_buffer[i + j] ^= (sys_time[0] ^ rand());
+                tmp_length++;
+            }
+        } else {
+            /* OK to use rand() just to scramble the seed */
+            data_buffer[i] ^= (sys_time[0] ^ rand());
+        }
     }
 
-    return 1;
+    total_length += (tmp_length - 1);
+
+    /*
+     * Size of seed is total_length*4 bytes (64bytes). The original assumption
+     * was that it contains 4 bits of entropy per byte. This makes a total
+     * amount of total_length*16 bits (256bits).
+     */
+    return RAND_POOL_add(pool,
+                         (PTR_T)data_buffer, total_length * 4,
+                         total_length * 16);
 }
 
 #endif