Always return multiple of block length bytes from default DRBG seed

[openssl.git] / fips / rand / fips_randtest.c

diff --git a/fips/rand/fips_randtest.c b/fips/rand/fips_randtest.c
index 88fb86060d04efc514fb27433bfa5b1d65432347..77015658380cccd6a8300a71c965b8e3afd987fc 100644 (file)
--- a/fips/rand/fips_randtest.c
+++ b/fips/rand/fips_randtest.c
@@ -103,6 +103,8 @@
  *
  */
 
+#define OPENSSL_FIPSAPI
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -123,8 +125,10 @@ int main(int argc, char *argv[])
 
 #else
 
-#include <openssl/fips.h>
+#define OPENSSL_FIPSAPI
+
 #include "fips_utl.h"
+#include <openssl/fips.h>
 
 typedef struct
        {
@@ -214,15 +218,15 @@ static void run_test(unsigned char *key, int keylen, AES_PRNG_MCT *tv)
     {
     unsigned char buf[16], dt[16];
     int i, j;
-    FIPS_rand_reset();
-    FIPS_rand_test_mode();
-    FIPS_rand_set_key(key, keylen);
-    FIPS_rand_seed(tv->V, 16);
+    FIPS_x931_reset();
+    FIPS_x931_test_mode();
+    FIPS_x931_set_key(key, keylen);
+    FIPS_x931_seed(tv->V, 16);
     memcpy(dt, tv->DT, 16);
     for (i = 0; i < 10000; i++)
        {
-       FIPS_rand_set_dt(dt);
-       FIPS_rand_bytes(buf, 16);
+       FIPS_x931_set_dt(dt);
+       FIPS_x931_bytes(buf, 16);
        /* Increment DT */
        for (j = 15; j >= 0; j--)
                {
@@ -237,7 +241,7 @@ static void run_test(unsigned char *key, int keylen, AES_PRNG_MCT *tv)
 
 int main()
        {
-       fips_set_error_print();
+       fips_algtest_init();
        run_test(aes_128_mct_key, 16, &aes_128_mct_tv);
        printf("FIPS PRNG test 1 done\n");
        run_test(aes_192_mct_key, 24, &aes_192_mct_tv);