Add CAVS test.

Various minor fixes.
Sigbus fixes for AES.

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/fipsrngdrv.c b/tests/fipsrngdrv.c
index d10c9cac..de2ad1ff 100644
--- a/tests/fipsrngdrv.c
+++ b/tests/fipsrngdrv.c
@@ -131,6 +131,7 @@ main (int argc, char **argv)
   int binary = 0;
   int loop = 0;
   int progress = 0;
+  int no_fips = 0;
   unsigned char key[16];
   unsigned char seed[16];
   unsigned char dt[16];
@@ -161,6 +162,11 @@ main (int argc, char **argv)
           verbose++;
           argc--; argv++;
         }
+      else if (!strcmp (*argv, "--no-fips"))
+        {
+          no_fips++;
+          argc--; argv++;
+        }
       else if (!strcmp (*argv, "--binary"))
         {
           binary = 1;
@@ -203,7 +209,8 @@ main (int argc, char **argv)
     fputs (PGM ": started\n", stderr);
 
   gcry_control (GCRYCTL_SET_VERBOSITY, (int)verbose);
-  gcry_control (GCRYCTL_FORCE_FIPS_MODE, 0);
+  if (!no_fips)
+    gcry_control (GCRYCTL_FORCE_FIPS_MODE, 0);
   if (!gcry_check_version ("1.4.3"))
     die ("version mismatch\n");
   gcry_control (GCRYCTL_DISABLE_SECMEM, 0);