Add x25519-x86_64.pl module, mod 2^255-19 primitives.

[openssl.git] / crypto / rand / rand_vms.c

diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c
index ae6f17d91fc85a2ee8809b8c33e1fca4f826c0b0..4ec4b35bd4a4e65b1c67199a1e0b017777d275b4 100644 (file)
--- a/crypto/rand/rand_vms.c
+++ b/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,19 +7,24 @@
  * https://www.openssl.org/source/license.html
  */
 
-#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>
 # include <starlet.h>
+# include <efndef>
 # ifdef __DECC
 #  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.
@@ -28,82 +33,93 @@
 #  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 amount of bytes */
+    short length, code;         /* length is number of bytes */
 } items_data[] = {
-    {
-        4, JPI$_BUFIO
-    },
-    {
-        4, JPI$_CPUTIM
-    },
-    {
-        4, JPI$_DIRIO
-    },
-    {
-        8, JPI$_LOGINTIM
-    },
-    {
-        4, JPI$_PAGEFLTS
-    },
-    {
-        4, JPI$_PID
-    },
-    {
-        4, JPI$_WSSIZE
-    },
-    {
-        0, 0
-    }
+    {4, JPI$_BUFIO},
+    {4, JPI$_CPUTIM},
+    {4, JPI$_DIRIO},
+    {4, JPI$_IMAGECOUNT},
+    {8, JPI$_LAST_LOGIN_I},
+    {8, JPI$_LOGINTIM},
+    {4, JPI$_PAGEFLTS},
+    {4, JPI$_PID},
+    {4, JPI$_PPGCNT},
+    {4, JPI$_WSPEAK},
+    {4, JPI$_FINALEXC},
+    {0, 0}
 };
 
-int RAND_poll(void)
+size_t RAND_POOL_acquire_entropy(RAND_POOL *pool)
 {
-    long pid, iosb[2];
-    int status = 0;
+    /* determine the number of items in the JPI array */
+    struct items_data_st item_entry;
+    int item_entry_count = OSSL_NELEM(items_data);
+    /* Create the JPI itemlist array to hold item_data content */
     struct {
         short length, code;
-        long *buffer;
+        int *buffer;
         int *retlen;
-    } item[32], *pitem;
-    unsigned char data_buffer[256];
-    short total_length = 0;
+    } 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 iosb[2];
+    int sys_time[2];
+    int *ptr;
+    int i, j ;
+    int tmp_length   = 0;
+    int total_length = 0;
 
+    /* Setup itemlist for GETJPI */
     pitems_data = items_data;
-    pitem = item;
-
-    /* Setup */
-    while (pitems_data->length && (total_length + pitems_data->length <= 256)) {
+    for (pitem = item; pitems_data->length != 0; pitem++) {
         pitem->length = pitems_data->length;
-        pitem->code = pitems_data->code;
-        pitem->buffer = (long *)&data_buffer[total_length];
+        pitem->code   = pitems_data->code;
+        pitem->buffer = &data_buffer[total_length];
         pitem->retlen = 0;
-        total_length += pitems_data->length;
+        /* total_length is in longwords */
+        total_length += pitems_data->length / 4;
         pitems_data++;
-        pitem ++;
     }
     pitem->length = pitem->code = 0;
 
-    /*
-     * Scan through all the processes in the system and add entropy with
-     * results from the processes that were possible to look at.
-     * However, view the information as only half trustable.
-     */
-    pid = -1;                   /* search context */
-    while ((status = sys$getjpiw(0, &pid, 0, item, iosb, 0, 0))
-           != SS$_NOMOREPROC) {
-        if (status == SS$_NORMAL) {
-            RAND_add((PTR_T) data_buffer, total_length, total_length / 2);
+    /* Fill data_buffer with various info bits from this process */
+    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());
         }
     }
-    sys$gettim(iosb);
-    RAND_add((PTR_T) iosb, sizeof(iosb), sizeof(iosb) / 2);
-    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