|
 |
07bd81d |
diff -up openssl-0.9.8j/crypto/rand/rand_lcl.h.rng-seed openssl-0.9.8j/crypto/rand/rand_lcl.h
|
|
|
07bd81d |
--- openssl-0.9.8j/crypto/rand/rand_lcl.h.rng-seed 2009-02-02 13:40:37.000000000 +0100
|
|
|
07bd81d |
+++ openssl-0.9.8j/crypto/rand/rand_lcl.h 2009-02-02 13:50:42.000000000 +0100
|
|
|
07bd81d |
@@ -112,7 +112,7 @@
|
|
|
07bd81d |
#ifndef HEADER_RAND_LCL_H
|
|
|
07bd81d |
#define HEADER_RAND_LCL_H
|
|
|
07bd81d |
|
|
|
07bd81d |
-#define ENTROPY_NEEDED 32 /* require 256 bits = 32 bytes of randomness */
|
|
|
07bd81d |
+#define ENTROPY_NEEDED 48 /* we need 48 bytes of randomness for FIPS rng */
|
|
|
07bd81d |
|
|
|
07bd81d |
|
|
|
07bd81d |
#if !defined(USE_MD5_RAND) && !defined(USE_SHA1_RAND) && !defined(USE_MDC2_RAND) && !defined(USE_MD2_RAND)
|
|
|
07bd81d |
diff -up openssl-0.9.8j/fips/rand/fips_rand.c.rng-seed openssl-0.9.8j/fips/rand/fips_rand.c
|
|
|
07bd81d |
--- openssl-0.9.8j/fips/rand/fips_rand.c.rng-seed 2008-09-16 12:12:18.000000000 +0200
|
|
|
07bd81d |
+++ openssl-0.9.8j/fips/rand/fips_rand.c 2009-02-02 14:06:58.000000000 +0100
|
|
|
07bd81d |
@@ -155,7 +155,18 @@ static int fips_set_prng_seed(FIPS_PRNG_
|
|
|
07bd81d |
{
|
|
|
07bd81d |
int i;
|
|
|
07bd81d |
if (!ctx->keyed)
|
|
|
07bd81d |
- return 0;
|
|
|
07bd81d |
+ {
|
|
|
07bd81d |
+ FIPS_RAND_SIZE_T keylen = 16;
|
|
|
07bd81d |
+
|
|
|
07bd81d |
+ if (seedlen - keylen < AES_BLOCK_LENGTH)
|
|
|
07bd81d |
+ return 0;
|
|
|
07bd81d |
+ if (seedlen - keylen - 8 >= AES_BLOCK_LENGTH)
|
|
|
07bd81d |
+ keylen += 8;
|
|
|
07bd81d |
+ if (seedlen - keylen - 8 >= AES_BLOCK_LENGTH)
|
|
|
07bd81d |
+ keylen += 8;
|
|
|
07bd81d |
+ seedlen -= keylen;
|
|
|
07bd81d |
+ fips_set_prng_key(ctx, seed+seedlen, keylen);
|
|
|
07bd81d |
+ }
|
|
|
07bd81d |
/* In test mode seed is just supplied data */
|
|
|
07bd81d |
if (ctx->test_mode)
|
|
|
07bd81d |
{
|
|
|
07bd81d |
diff -up openssl-0.9.8j/fips/fips.c.rng-seed openssl-0.9.8j/fips/fips.c
|
|
|
07bd81d |
--- openssl-0.9.8j/fips/fips.c.rng-seed 2009-02-02 13:40:38.000000000 +0100
|
|
|
07bd81d |
+++ openssl-0.9.8j/fips/fips.c 2009-02-02 13:49:32.000000000 +0100
|
|
|
07bd81d |
@@ -509,22 +509,22 @@ int FIPS_mode_set(int onoff)
|
|
|
07bd81d |
goto end;
|
|
|
07bd81d |
}
|
|
|
07bd81d |
|
|
|
07bd81d |
+ /* now switch into FIPS mode */
|
|
|
07bd81d |
+ fips_set_rand_check(FIPS_rand_method());
|
|
|
07bd81d |
+ RAND_set_rand_method(FIPS_rand_method());
|
|
|
07bd81d |
+
|
|
|
07bd81d |
/* automagically seed PRNG if not already seeded */
|
|
|
07bd81d |
if(!FIPS_rand_status())
|
|
|
07bd81d |
{
|
|
|
07bd81d |
- if(RAND_bytes(buf,sizeof buf) <= 0)
|
|
|
07bd81d |
+ RAND_poll();
|
|
|
07bd81d |
+ if (!FIPS_rand_status())
|
|
|
07bd81d |
{
|
|
|
07bd81d |
fips_selftest_fail = 1;
|
|
|
07bd81d |
ret = 0;
|
|
|
07bd81d |
goto end;
|
|
|
07bd81d |
}
|
|
|
07bd81d |
- FIPS_rand_set_key(buf,32);
|
|
|
07bd81d |
- FIPS_rand_seed(buf+32,16);
|
|
|
07bd81d |
}
|
|
|
07bd81d |
|
|
|
07bd81d |
- /* now switch into FIPS mode */
|
|
|
07bd81d |
- fips_set_rand_check(FIPS_rand_method());
|
|
|
07bd81d |
- RAND_set_rand_method(FIPS_rand_method());
|
|
|
07bd81d |
if(FIPS_selftest())
|
|
|
07bd81d |
fips_set_mode(1);
|
|
|
07bd81d |
else
|