From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 22 Nov 2013 11:12:57 +0000 (+0100)
Subject: Restrict the number of tests run on FIPS140-2 mode.
X-Git-Tag: gnutls_3_3_0pre0~520^2~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f419ce3ff8954758dc3a95d5eff2ce25cd4ff883;p=thirdparty%2Fgnutls.git

Restrict the number of tests run on FIPS140-2 mode.
---

diff --git a/tests/mini-overhead.c b/tests/mini-overhead.c
index cf5d1e19c2..529c71f391 100644
--- a/tests/mini-overhead.c
+++ b/tests/mini-overhead.c
@@ -335,6 +335,7 @@ void doit(void)
 	start
 	    ("NONE:+VERS-DTLS1.0:+AES-128-GCM:+AEAD:+SIGN-ALL:+COMP-NULL:+RSA",
 	     37);
+#ifndef ENABLE_FIPS140
 	/* 13 + 20(tag) */
 	start
 	    ("NONE:+VERS-DTLS1.0:+SALSA20-256:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA",
@@ -343,6 +344,7 @@ void doit(void)
 	start
 	    ("NONE:+VERS-DTLS1.0:+SALSA20-256:+UMAC-96:+SIGN-ALL:+COMP-NULL:+RSA",
 	     25);
+#endif
 }
 
 #endif				/* _WIN32 */
diff --git a/tests/mini-record-2.c b/tests/mini-record-2.c
index b6104b42fb..0d27acc4a1 100644
--- a/tests/mini-record-2.c
+++ b/tests/mini-record-2.c
@@ -377,9 +377,6 @@ void doit(void)
 {
 	signal(SIGCHLD, ch_handler);
 
-	start(NULL_SHA1, 0);
-
-	start(NEW_ARCFOUR_SHA1, 1);
 	start(NEW_AES_CBC, 1);
 	start(NEW_AES_CBC_SHA256, 1);
 	start(NEW_AES_GCM, 1);
@@ -388,8 +385,13 @@ void doit(void)
 	start(AES_CBC_SHA256, 1);
 	start(AES_GCM, 0);
 
+#ifndef ENABLE_FIPS140
+	start(NULL_SHA1, 0);
+	start(NEW_ARCFOUR_SHA1, 1);
+
 	start(ARCFOUR_SHA1, 0);
 	start(ARCFOUR_MD5, 0);
+#endif
 
 	start(ARCFOUR_SHA1_ZLIB, 0);
 	start(NEW_ARCFOUR_SHA1_ZLIB, 1);
diff --git a/tests/mini-x509.c b/tests/mini-x509.c
index 333d544df9..edd67aa291 100644
--- a/tests/mini-x509.c
+++ b/tests/mini-x509.c
@@ -107,7 +107,11 @@ void doit(void)
 	gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE,
 			       serverx509cred);
 	gnutls_priority_set_direct(server,
+#ifndef ENABLE_FIPS140
 				   "NORMAL:-CIPHER-ALL:+ARCFOUR-128",
+#else
+				   "NORMAL:-CIPHER-ALL:+AES-128-CBC",
+#endif
 				   NULL);
 	gnutls_transport_set_push_function(server, server_push);
 	gnutls_transport_set_pull_function(server, server_pull);
diff --git a/tests/pkcs12-decode/Makefile.am b/tests/pkcs12-decode/Makefile.am
index 5da1124f2d..c08e4d9ae2 100644
--- a/tests/pkcs12-decode/Makefile.am
+++ b/tests/pkcs12-decode/Makefile.am
@@ -24,7 +24,9 @@ EXTRA_DIST = client.p12 noclient.p12 unclient.p12 pkcs12_2certs.p12 \
 
 dist_check_SCRIPTS = pkcs12
 
+if !ENABLE_FIPS140
 TESTS = pkcs12
+endif
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
 	LC_ALL="C"						\
diff --git a/tests/pkcs12_encode.c b/tests/pkcs12_encode.c
index 42a01812d3..b3252dd160 100644
--- a/tests/pkcs12_encode.c
+++ b/tests/pkcs12_encode.c
@@ -81,7 +81,7 @@ void doit(void)
 	int ret, indx;
 	char outbuf[10240];
 	size_t size;
-	int i;
+	unsigned tests, i;
 
 	ret = global_init();
 	if (ret < 0) {
@@ -128,7 +128,12 @@ void doit(void)
 	}
 
 	/* Generate and add PKCS#12 cert bags. */
-	for (i = 0; i < 2; i++) {
+#ifndef ENABLE_FIPS140
+	tests = 2; /* include RC2 */
+#else
+	tests = 1;
+#endif
+	for (i = 0; i < tests; i++) {
 		ret = gnutls_pkcs12_bag_init(&bag);
 		if (ret < 0) {
 			fprintf(stderr, "bag_init: %d", ret);
diff --git a/tests/priorities.c b/tests/priorities.c
index bf183fe164..7b9de3cc64 100644
--- a/tests/priorities.c
+++ b/tests/priorities.c
@@ -31,6 +31,14 @@
 
 #include "utils.h"
 
+#ifdef ENABLE_FIPS140
+void doit(void)
+{
+	exit(77);
+}
+
+#else
+
 static void
 try_prio(const char *prio, unsigned expected_cs, unsigned expected_ciphers)
 {
@@ -109,3 +117,5 @@ void doit(void)
 	try_prio("SECURE128:+SECURE256:+NORMAL", normal, 10);	/* should be the same as NORMAL */
 	try_prio("SUITEB192", 1, 1);
 }
+
+#endif
diff --git a/tests/record-sizes.c b/tests/record-sizes.c
index 11edde15e1..4f52e54a02 100644
--- a/tests/record-sizes.c
+++ b/tests/record-sizes.c
@@ -43,6 +43,8 @@ static void tls_log_func(int level, const char *str)
 /* This test attempts to transfer various sizes using ARCFOUR-128.
  */
 
+#ifndef ENABLE_FIPS140
+
 #define MAX_BUF 16384
 static char b1[MAX_BUF + 1];
 static char buffer[MAX_BUF + 1];
@@ -156,3 +158,10 @@ void doit(void)
 
 	gnutls_global_deinit();
 }
+
+#else
+void doit(void)
+{
+	exit(77);
+}
+#endif
diff --git a/tests/set_pkcs12_cred.c b/tests/set_pkcs12_cred.c
index 5038a8ef47..9381c3f659 100644
--- a/tests/set_pkcs12_cred.c
+++ b/tests/set_pkcs12_cred.c
@@ -34,6 +34,7 @@ static void tls_log_func(int level, const char *str)
 	fprintf(stderr, "<%d>| %s", level, str);
 }
 
+#ifndef ENABLE_FIPS140
 void doit(void)
 {
 	gnutls_certificate_credentials_t x509cred;
@@ -113,3 +114,9 @@ void doit(void)
 
 	gnutls_global_deinit();
 }
+#else
+void doit(void)
+{
+	exit(77);
+}
+#endif