A whole bunch of changes to eventually support

FIPS restricted mode.  Also some documentation 
improvements and other minor enhancements. 
See the ChangeLogs. Stay tuned.

1 files changed, 7 insertions, 1 deletions

diff --git a/tests/benchmark.c b/tests/benchmark.c
index 424461ad..f428a15d 100644
--- a/tests/benchmark.c
+++ b/tests/benchmark.c
@@ -992,12 +992,13 @@ main( int argc, char **argv )
   if (argc)
     { argc--; argv++; }
 
-  gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
   if (!gcry_check_version (GCRYPT_VERSION))
     {
       fprintf (stderr, PGM ": version mismatch\n");
       exit (1);
     }
+  gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
+
   if (argc && !strcmp (*argv, "--use-random-daemon"))
     {
       gcry_control (GCRYCTL_USE_RANDOM_DAEMON, 1);
@@ -1048,6 +1049,11 @@ main( int argc, char **argv )
               argc--; argv++;
             }
         }
+      else if (!strcmp (*argv, "--fips"))
+        {
+          argc--; argv++;
+          gcry_control (GCRYCTL_FORCE_FIPS_MODE, 0);
+        }
     }          
   gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);