execute the FIPS-test even when not in FIPS140 mode.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b3e141f24b2c9ba1cd6524b52196f42ef5c390bb..520e07004c837ede15ada0dfbe45313e02680ca9 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -73,11 +73,8 @@ ctests = simple gc set_pkcs12_cred certder certuniqueid      \
         mini-dtls-heartbeat mini-x509-callbacks key-openssl priorities \
         mini-dtls-srtp mini-xssl rsa-encrypt-decrypt mini-loss-time \
         mini-record mini-dtls-record mini-handshake-timeout mini-record-range \
-        mini-cert-status mini-rsa-psk mini-record-2 global-init
-
-if ENABLE_FIPS140
-ctests += fips-test
-endif
+        mini-cert-status mini-rsa-psk mini-record-2 global-init \
+        fips-test
 
 if ENABLE_OCSP
 ctests += ocsp

diff --git a/tests/fips-test.c b/tests/fips-test.c
index cf3b833422b6ea27adeb15c374353e08575179d3..9566e0d1a76f3d4331ab09199a8c347d702dad87 100644 (file)
--- a/tests/fips-test.c
+++ b/tests/fips-test.c
@@ -26,7 +26,6 @@ static uint8_t iv16[16];
 void doit(void)
 {
        int ret;
-#ifdef ENABLE_FIPS140
        unsigned int mode;
        gnutls_cipher_hd_t ch;
        gnutls_hmac_hd_t mh;
@@ -38,7 +37,7 @@ void doit(void)
        gnutls_datum_t iv = { iv16, sizeof(iv16) };
 
        fprintf(stderr,
-               "Please note that you need to assure the library's integrity prior to running this test\n");
+               "Please note that if in FIPS140 mode, you need to assure the library's integrity prior to running this test\n");
 
        gnutls_global_set_log_function(tls_log_func);
        if (debug)
@@ -47,7 +46,6 @@ void doit(void)
        mode = gnutls_fips140_mode_enabled();
        if (mode == 0) {
                success("We are not in FIPS140 mode\n");
-               exit(77);
        }
 
        ret = global_init();
@@ -141,7 +139,4 @@ void doit(void)
 
        gnutls_global_deinit();
        return;
-#else
-       exit(1);                /* fail. This script shouldn't be called on this case */
-#endif
 }