Add continuous RNG test to entropy source. Entropy callbacks now need

[openssl.git] / fips / fips_utl.h

diff --git a/fips/fips_utl.h b/fips/fips_utl.h
index 63541d996efe724acf2fdf4475325dfa4bacc2b6..edd249b84fa4c595a4abb95eb28089dec8d3f13d 100644 (file)
--- a/fips/fips_utl.h
+++ b/fips/fips_utl.h
@@ -49,11 +49,14 @@
 
 #define OPENSSL_FIPSAPI
 
+#include <openssl/fips_rand.h>
+#include <openssl/objects.h>
+
 int hex2bin(const char *in, unsigned char *out);
 unsigned char *hex2bin_m(const char *in, long *plen);
 int do_hex2bn(BIGNUM **pr, const char *in);
-int do_bn_print(FILE *out, BIGNUM *bn);
-int do_bn_print_name(FILE *out, const char *name, BIGNUM *bn);
+int do_bn_print(FILE *out, const BIGNUM *bn);
+int do_bn_print_name(FILE *out, const char *name, const BIGNUM *bn);
 int parse_line(char **pkw, char **pval, char *linebuf, char *olinebuf);
 BIGNUM *hex2bn(const char *in);
 int bin2hex(const unsigned char *in,int len,char *out);
@@ -63,6 +66,8 @@ int bint2bin(const char *in, int len, unsigned char *out);
 int bin2bint(const unsigned char *in,int len,char *out);
 void PrintValue(char *tag, unsigned char *val, int len);
 void OutputValue(char *tag, unsigned char *val, int len, FILE *rfp,int bitmode);
+void fips_algtest_init(void);
+void do_entropy_stick(void);
 
 static int no_err;
 
@@ -70,8 +75,9 @@ static void put_err_cb(int lib, int func,int reason,const char *file,int line)
        {
                if (no_err)
                        return;
-               fprintf(stderr, "ERROR:lib=%d,func=%d,reason=%d"
+               fprintf(stderr, "ERROR:%08lX:lib=%d,func=%d,reason=%d"
                                ":file=%s:line=%d\n",
+                       ERR_PACK(lib, func, reason),
                        lib, func, reason, file, line);
        }
 
@@ -91,16 +97,64 @@ static void add_err_cb(int num, va_list args)
        fputs("\n", stderr);
        }
 
-static void fips_set_error_print(void)
+/* Dummy Entropy to keep DRBG happy. WARNING: THIS IS TOTALLY BOGUS
+ * HAS ZERO SECURITY AND MUST NOT BE USED IN REAL APPLICATIONS.
+ */
+
+static unsigned char dummy_entropy[1024];
+
+static size_t dummy_cb(DRBG_CTX *ctx, unsigned char **pout,
+                                int entropy, size_t min_len, size_t max_len)
+       {
+       *pout = dummy_entropy;
+       return min_len;
+       }
+
+static int entropy_stick = 0;
+
+static void fips_algtest_init_nofips(void)
        {
+       DRBG_CTX *ctx;
+       size_t i;
        FIPS_set_error_callbacks(put_err_cb, add_err_cb);
+       for (i = 0; i < sizeof(dummy_entropy); i++)
+               dummy_entropy[i] = i & 0xff;
+       if (entropy_stick)
+               memcpy(dummy_entropy + 32, dummy_entropy + 16, 16);
+       ctx = FIPS_get_default_drbg();
+       FIPS_drbg_init(ctx, NID_aes_256_ctr, DRBG_FLAG_CTR_USE_DF);
+       FIPS_drbg_set_callbacks(ctx, dummy_cb, 0, 16, dummy_cb, 0);
+       FIPS_drbg_instantiate(ctx, dummy_entropy, 10);
+       FIPS_rand_set_method(FIPS_drbg_method());
+       }
+
+void do_entropy_stick(void)
+       {
+       entropy_stick = 1;
+       }
+
+void fips_algtest_init(void)
+       {
+       fips_algtest_init_nofips();
+       if (!FIPS_mode_set(1))
+               {
+               fprintf(stderr, "Error entering FIPS mode\n");
+               exit(1);
+               }
        }
 
 int hex2bin(const char *in, unsigned char *out)
     {
-    int n1, n2;
+    int n1, n2, isodd = 0;
     unsigned char ch;
 
+    n1 = strlen(in);
+    if (in[n1 - 1] == '\n')
+       n1--;
+
+    if (n1 & 1)
+       isodd = 1;
+
     for (n1=0,n2=0 ; in[n1] && in[n1] != '\n' ; )
        { /* first byte */
        if ((in[n1] >= '0') && (in[n1] <= '9'))
@@ -120,7 +174,7 @@ int hex2bin(const char *in, unsigned char *out)
         * all digits valid hex and null terminated which is true for the
         * strings we pass.
         */
-       if (n1 == 1 && strlen(in) & 1)
+       if (n1 == 1 && isodd)
                {
                out[n2++] = ch;
                continue;
@@ -171,7 +225,7 @@ int do_hex2bn(BIGNUM **pr, const char *in)
        return r;
        }
 
-int do_bn_print(FILE *out, BIGNUM *bn)
+int do_bn_print(FILE *out, const BIGNUM *bn)
        {
        int len, i;
        unsigned char *tmp;
@@ -195,7 +249,7 @@ int do_bn_print(FILE *out, BIGNUM *bn)
        return 1;
        }
 
-int do_bn_print_name(FILE *out, const char *name, BIGNUM *bn)
+int do_bn_print_name(FILE *out, const char *name, const BIGNUM *bn)
        {
        int r;
        fprintf(out, "%s = ", name);
@@ -238,6 +292,9 @@ int parse_line(char **pkw, char **pval, char *linebuf, char *olinebuf)
        /* Remove trailing space from value */
        p = value + strlen(value) - 1;
 
+       if (*p != '\n')
+               fprintf(stderr, "Warning: missing EOL\n");
+
        while (*p == '\n' || isspace((unsigned char)*p))
                *p-- = 0;