PR: 2632

[oweals/openssl.git] / crypto / rand / rand_lib.c

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index ef10dd507eb4ef15c70e12d8c16deb5ff55e5a74..8c28550a7606b125dee5fec5d2236e578ccf89d0 100644 (file)
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -65,6 +65,11 @@
 #include <openssl/engine.h>
 #endif
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#include <openssl/fips_rand.h>
+#endif
+
 #ifndef OPENSSL_NO_ENGINE
 /* non-NULL if default_RAND_meth is ENGINE-provided */
 static ENGINE *funct_ref =NULL;
@@ -178,9 +183,6 @@ int RAND_status(void)
 
 #ifdef OPENSSL_FIPS
 
-#include <openssl/fips.h>
-#include <openssl/fips_rand.h>
-
 /* FIPS DRBG initialisation code. This sets up the DRBG for use by the
  * rest of OpenSSL. 
  */
@@ -192,6 +194,8 @@ int RAND_status(void)
 static size_t drbg_get_entropy(DRBG_CTX *ctx, unsigned char **pout,
                                 int entropy, size_t min_len, size_t max_len)
         {
+       /* Round up request to multiple of block size */
+       min_len = ((min_len + 19) / 20) * 20;
        *pout = OPENSSL_malloc(min_len);
        if (!*pout)
                return 0;
@@ -210,6 +214,20 @@ static void drbg_free_entropy(DRBG_CTX *ctx, unsigned char *out, size_t olen)
        OPENSSL_free(out);
        }
 
+/* Set "additional input" when generating random data. This uses the
+ * current PID, a time value and a counter.
+ */
+
+static size_t drbg_get_adin(DRBG_CTX *ctx, unsigned char **pout)
+       {
+       /* Use of static variables is OK as this happens under a lock */
+       static unsigned char buf[16];
+       static unsigned long counter;
+       FIPS_get_timevec(buf, &counter);
+       *pout = buf;
+       return sizeof(buf);
+       }
+
 /* RAND_add() and RAND_seed() pass through to OpenSSL PRNG so it is 
  * correctly seeded by RAND_poll().
  */
@@ -228,14 +246,20 @@ static int drbg_rand_seed(DRBG_CTX *ctx, const void *in, int inlen)
 int RAND_init_fips(void)
        {
        DRBG_CTX *dctx;
-       unsigned char pers[16] = {0,0,0};
+       size_t plen;
+       unsigned char pers[32], *p;
        dctx = FIPS_get_default_drbg();
         FIPS_drbg_init(dctx, NID_aes_256_ctr, DRBG_FLAG_CTR_USE_DF);
         FIPS_drbg_set_callbacks(dctx,
-                               drbg_get_entropy, drbg_free_entropy,
+                               drbg_get_entropy, drbg_free_entropy, 20,
                                drbg_get_entropy, drbg_free_entropy);
-       FIPS_drbg_set_rand_callbacks(dctx, 0, 0,
+       FIPS_drbg_set_rand_callbacks(dctx, drbg_get_adin, 0,
                                        drbg_rand_seed, drbg_rand_add);
+       /* Personalisation string: a string followed by date time vector */
+       strcpy((char *)pers, "OpenSSL DRBG2.0");
+       plen = drbg_get_adin(dctx, &p);
+       memcpy(pers + 16, p, plen);
+
         FIPS_drbg_instantiate(dctx, pers, sizeof(pers));
         FIPS_rand_set_method(FIPS_drbg_method());
        return 1;