Skip tests that require the non-suiteb curves.

Conflicts:
	lib/crypto-selftests-pk.c

2 files changed, 9 insertions, 6 deletions

diff --git a/tests/mini-xssl.c b/tests/mini-xssl.c
index c6d8c82dfc..1834353da7 100644
--- a/tests/mini-xssl.c
+++ b/tests/mini-xssl.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) || !defined(ENABLE_NON_SUITEB_CURVES)
 
 int main()
 {
@@ -70,7 +70,7 @@ static time_t mytime(time_t * t)
 
 static void server_log_func(int level, const char *str)
 {
-//  fprintf (stderr, "server|<%d>| %s", level, str);
+  fprintf (stderr, "server|<%d>| %s", level, str);
 }
 
 static void client_log_func(int level, const char *str)
@@ -257,13 +257,12 @@ static void server(int fd, unsigned vmethod)
 	gnutls_cinput_st aux[6];
 	unsigned aux_size = 0;
 
-	global_init();
-
 	if (debug) {
-		gnutls_global_set_log_function(client_log_func);
+		gnutls_global_set_log_function(server_log_func);
 		gnutls_global_set_log_level(7);
 	}
 
+	global_init();
 
 	aux[aux_size].type = GNUTLS_CINPUT_TYPE_MEM;
 	aux[aux_size].contents = GNUTLS_CINPUT_KEYPAIR;
diff --git a/tests/pkcs12_simple.c b/tests/pkcs12_simple.c
index bbfe97d181..f182860aaa 100644
--- a/tests/pkcs12_simple.c
+++ b/tests/pkcs12_simple.c
@@ -38,13 +38,14 @@ static void tls_log_func(int level, const char *str)
 
 void doit(void)
 {
+#ifdef ENABLE_NON_SUITEB_CURVES
 	const char *filename, *password = "1234";
 	gnutls_pkcs12_t pkcs12;
 	unsigned char *file_data;
 	size_t file_size;
 	gnutls_datum_t data;
 	gnutls_x509_crt_t *chain, *extras;
-	unsigned int chain_size, extras_size, i;
+	unsigned int chain_size = 0, extras_size = 0, i;
 	gnutls_x509_privkey_t pkey;
 	int ret;
 
@@ -148,4 +149,7 @@ void doit(void)
 	free(file_data);
 
 	gnutls_global_deinit();
+#else
+	exit(77);
+#endif
 }