From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 4 Jun 2024 00:31:31 +0000 (+0900)
Subject: tests: add missing global_init/gnutls_global_deinit for MinGW
X-Git-Tag: 3.8.6~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ce4ffa39ec7ab8e10cd419960576dfe10f2e01f;p=thirdparty%2Fgnutls.git

tests: add missing global_init/gnutls_global_deinit for MinGW

Signed-off-by: Daiki Ueno <ueno@gnu.org>
---

diff --git a/tests/crl_apis.c b/tests/crl_apis.c
index 585e44c38e..67537733c2 100644
--- a/tests/crl_apis.c
+++ b/tests/crl_apis.c
@@ -308,6 +308,8 @@ void doit(void)
 	gnutls_datum_t out;
 	gnutls_x509_crl_t crl;
 
+	global_init();
+
 	gnutls_global_set_time_function(mytime);
 
 	crl = generate_crl(0);
@@ -343,4 +345,6 @@ void doit(void)
 
 	gnutls_free(out.data);
 	gnutls_x509_crl_deinit(crl);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/crq_apis.c b/tests/crq_apis.c
index 9ccae54d4e..f2e9b1154d 100644
--- a/tests/crq_apis.c
+++ b/tests/crq_apis.c
@@ -391,14 +391,6 @@ static void run_set_extensions(gnutls_x509_crq_t crq)
 	gnutls_datum_t out;
 	int ret;
 
-	ret = global_init();
-	if (ret < 0)
-		fail("global_init\n");
-
-	gnutls_global_set_log_function(tls_log_func);
-	if (debug)
-		gnutls_global_set_log_level(4711);
-
 	ret = gnutls_x509_crt_init(&crt);
 	if (ret != 0)
 		fail("gnutls_x509_crt_init\n");
@@ -456,8 +448,6 @@ static void run_set_extensions(gnutls_x509_crq_t crq)
 	gnutls_free(out.data);
 
 	gnutls_x509_crt_deinit(crt);
-
-	gnutls_global_deinit();
 }
 
 static void run_set_extension_by_oid(gnutls_x509_crq_t crq)
@@ -470,14 +460,6 @@ static void run_set_extension_by_oid(gnutls_x509_crq_t crq)
 	int ret;
 	char oid[128];
 
-	ret = global_init();
-	if (ret < 0)
-		fail("global_init\n");
-
-	gnutls_global_set_log_function(tls_log_func);
-	if (debug)
-		gnutls_global_set_log_level(4711);
-
 	ret = gnutls_x509_crt_init(&crt);
 	if (ret != 0)
 		fail("gnutls_x509_crt_init\n");
@@ -555,14 +537,21 @@ static void run_set_extension_by_oid(gnutls_x509_crq_t crq)
 	gnutls_free(out.data);
 
 	gnutls_x509_crt_deinit(crt);
-
-	gnutls_global_deinit();
 }
 
 void doit(void)
 {
 	gnutls_datum_t out;
 	gnutls_x509_crq_t crq;
+	int ret;
+
+	ret = global_init();
+	if (ret < 0)
+		fail("global_init\n");
+
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(4711);
 
 	gnutls_global_set_time_function(mytime);
 
@@ -582,4 +571,6 @@ void doit(void)
 
 	gnutls_free(out.data);
 	gnutls_x509_crq_deinit(crq);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/dh-compute2.c b/tests/dh-compute2.c
index 9876faf043..4098588ca4 100644
--- a/tests/dh-compute2.c
+++ b/tests/dh-compute2.c
@@ -353,6 +353,8 @@ void doit(void)
 		{ NULL }
 	};
 
+	global_init();
+
 	for (int i = 0; test_data[i].name != NULL; i++) {
 		gnutls_datum_t priv_key = { NULL, 0 }, pub_key = { NULL, 0 };
 		const gnutls_datum_t *q =
@@ -439,4 +441,6 @@ void doit(void)
 	}
 
 	success("all ok\n");
+
+	gnutls_global_deinit();
 }
diff --git a/tests/dh-params.c b/tests/dh-params.c
index 0ec7370964..1c65158a84 100644
--- a/tests/dh-params.c
+++ b/tests/dh-params.c
@@ -68,6 +68,8 @@ void doit(void)
 	unsigned bits = 0;
 	int ret;
 
+	global_init();
+
 	/* import DH parameters from DSA key and verify they are the same */
 	assert(gnutls_dh_params_init(&dh_params) >= 0);
 	assert(gnutls_dh_params_init(&tmp_params) >= 0);
@@ -112,4 +114,6 @@ void doit(void)
 	gnutls_dh_params_deinit(dh_params);
 	gnutls_x509_privkey_deinit(privkey);
 	success("all ok\n");
+
+	gnutls_global_deinit();
 }
diff --git a/tests/dss-sig-val.c b/tests/dss-sig-val.c
index f8d40ad867..8c078ff8c8 100644
--- a/tests/dss-sig-val.c
+++ b/tests/dss-sig-val.c
@@ -193,8 +193,12 @@ void doit(void)
 {
 	unsigned i;
 
+	global_init();
+
 	for (i = 0; i < sizeof(encode_tests) / sizeof(encode_tests[0]); i++) {
 		encode(encode_tests[i].name, &encode_tests[i].sig,
 		       &encode_tests[i].r, &encode_tests[i].s);
 	}
+
+	gnutls_global_deinit();
 }
diff --git a/tests/ecdh-compute2.c b/tests/ecdh-compute2.c
index 5c5f4a4c79..d2aee542d5 100644
--- a/tests/ecdh-compute2.c
+++ b/tests/ecdh-compute2.c
@@ -241,6 +241,8 @@ void doit(void)
 		{ 0 }
 	};
 
+	global_init();
+
 	for (int i = 0; test_data[i].curve != 0; i++) {
 		gnutls_datum_t x, y, key;
 		const gnutls_datum_t *result =
@@ -272,4 +274,6 @@ void doit(void)
 	}
 
 	success("all ok\n");
+
+	gnutls_global_deinit();
 }
diff --git a/tests/gnutls_ocsp_resp_list_import2.c b/tests/gnutls_ocsp_resp_list_import2.c
index fdceb2188d..bc9aa1b7c9 100644
--- a/tests/gnutls_ocsp_resp_list_import2.c
+++ b/tests/gnutls_ocsp_resp_list_import2.c
@@ -242,6 +242,8 @@ void doit(void)
 {
 	unsigned int i;
 
+	global_init();
+
 	for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
 		success("checking: %s\n", tests[i].name);
 
diff --git a/tests/gnutls_session_set_id.c b/tests/gnutls_session_set_id.c
index 2d70f03b4b..4b179cd0d8 100644
--- a/tests/gnutls_session_set_id.c
+++ b/tests/gnutls_session_set_id.c
@@ -102,10 +102,6 @@ static void start(const char *test, unsigned try_resume)
 	success("%s\n", test);
 	reset_buffers();
 
-	gnutls_global_set_log_function(tls_log_func);
-	if (debug)
-		gnutls_global_set_log_level(6);
-
 	assert(gnutls_certificate_allocate_credentials(&serverx509cred) >= 0);
 	assert(gnutls_certificate_set_x509_key_mem(serverx509cred, &server_cert,
 						   &server_key,
@@ -207,6 +203,14 @@ static void start(const char *test, unsigned try_resume)
 
 void doit(void)
 {
+	global_init();
+
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(6);
+
 	start("functional: see if session ID is sent", 0);
 	start("negative: see if the expected error is seen on client side", 1);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/gnutls_x509_crq_sign.c b/tests/gnutls_x509_crq_sign.c
index 4eacb99a0b..a94aeff292 100644
--- a/tests/gnutls_x509_crq_sign.c
+++ b/tests/gnutls_x509_crq_sign.c
@@ -145,6 +145,8 @@ void doit(void)
 	gnutls_datum_t out;
 	gnutls_x509_crq_t crq;
 
+	global_init();
+
 	gnutls_global_set_time_function(mytime);
 
 	crq = generate_crq();
@@ -161,4 +163,6 @@ void doit(void)
 
 	gnutls_free(out.data);
 	gnutls_x509_crq_deinit(crq);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/gnutls_x509_crt_list_import.c b/tests/gnutls_x509_crt_list_import.c
index 0168dcd0cb..467f011d98 100644
--- a/tests/gnutls_x509_crt_list_import.c
+++ b/tests/gnutls_x509_crt_list_import.c
@@ -351,6 +351,8 @@ void doit(void)
 {
 	unsigned int i;
 
+	global_init();
+
 	for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
 		success("checking: %s\n", tests[i].name);
 
diff --git a/tests/gnutls_x509_privkey_import.c b/tests/gnutls_x509_privkey_import.c
index fd3f750ed4..f1182916de 100644
--- a/tests/gnutls_x509_privkey_import.c
+++ b/tests/gnutls_x509_privkey_import.c
@@ -214,6 +214,8 @@ void doit(void)
 {
 	unsigned int i;
 
+	global_init();
+
 	for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
 		success("checking: %s\n", tests[i].name);
 
diff --git a/tests/key-export-pkcs8.c b/tests/key-export-pkcs8.c
index b78fe60003..34c14f01b8 100644
--- a/tests/key-export-pkcs8.c
+++ b/tests/key-export-pkcs8.c
@@ -259,6 +259,8 @@ static int check_ecc(void)
 
 void doit(void)
 {
+	global_init();
+
 	if (check_dsa() != 0) {
 		fail("error in DSA check\n");
 		exit(1);
@@ -280,4 +282,6 @@ void doit(void)
 	if (check_gost() != 0) {
 		fail("error in gost check\n");
 	}
+
+	gnutls_global_deinit();
 }
diff --git a/tests/keylog-env.c b/tests/keylog-env.c
index 3417439518..9016967bde 100644
--- a/tests/keylog-env.c
+++ b/tests/keylog-env.c
@@ -153,10 +153,11 @@ void doit(void)
 {
 	char filename[TMPNAME_SIZE];
 
+	global_init();
+
 	assert(get_tmpname(filename) != NULL);
 
 	remove(filename);
-	global_init();
 
 	run(filename,
 	    "NONE:+VERS-TLS1.2:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA",
diff --git a/tests/mini-global-load.c b/tests/mini-global-load.c
index 8afb5931bc..b17ebce144 100644
--- a/tests/mini-global-load.c
+++ b/tests/mini-global-load.c
@@ -26,6 +26,14 @@
 #include "config.h"
 #endif
 
+#if defined(_WIN32)
+
+int main(int argc, char **argv)
+{
+	exit(77);
+}
+
+#else
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -138,3 +146,4 @@ void doit(void)
 	start("NORMAL:-VERS-ALL:+VERS-TLS1.3");
 	start("NORMAL");
 }
+#endif
diff --git a/tests/name-constraints.c b/tests/name-constraints.c
index 85f309ebab..71216b700d 100644
--- a/tests/name-constraints.c
+++ b/tests/name-constraints.c
@@ -126,6 +126,8 @@ void doit(void)
 	unsigned type;
 	gnutls_datum_t name;
 
+	global_init();
+
 	gnutls_global_set_log_function(tls_log_func);
 	if (debug)
 		gnutls_global_set_log_level(6);
@@ -368,4 +370,6 @@ void doit(void)
 
 	if (debug)
 		success("Test success.\n");
+
+	gnutls_global_deinit();
 }
diff --git a/tests/ocsp-filename-memleak.c b/tests/ocsp-filename-memleak.c
index 91e2608bcd..98c741b698 100644
--- a/tests/ocsp-filename-memleak.c
+++ b/tests/ocsp-filename-memleak.c
@@ -46,6 +46,8 @@ void doit(void)
 {
 	gnutls_certificate_credentials_t x509_cred;
 
+	global_init();
+
 	gnutls_certificate_allocate_credentials(&x509_cred);
 	/* The file does not need to exist for this test
 	 */
@@ -55,6 +57,8 @@ void doit(void)
 							"ocsp-status.der", 0);
 
 	gnutls_certificate_free_credentials(x509_cred);
+
+	gnutls_global_deinit();
 }
 
 #endif
diff --git a/tests/pcert-list.c b/tests/pcert-list.c
index 793bfbfd30..2a1e053f15 100644
--- a/tests/pcert-list.c
+++ b/tests/pcert-list.c
@@ -255,6 +255,8 @@ void doit(void)
 	unsigned pcert_list_size, flags, i;
 	int ret;
 
+	global_init();
+
 	flags = GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED;
 
 	pcert_list_size = 3;
@@ -370,4 +372,6 @@ void doit(void)
 		gnutls_pcert_deinit(&pcert_list[i]);
 
 	success("all ok\n");
+
+	gnutls_global_deinit();
 }
diff --git a/tests/pkcs1-digest-info.c b/tests/pkcs1-digest-info.c
index b47a45a0d6..7d8412db97 100644
--- a/tests/pkcs1-digest-info.c
+++ b/tests/pkcs1-digest-info.c
@@ -213,6 +213,8 @@ void doit(void)
 {
 	unsigned i;
 
+	global_init();
+
 	for (i = 0; i < sizeof(encode_tests) / sizeof(encode_tests[0]); i++) {
 		encode(encode_tests[i].name, encode_tests[i].hash,
 		       &encode_tests[i].raw, &encode_tests[i].di);
@@ -223,4 +225,6 @@ void doit(void)
 		       &decode_tests[i].raw, &decode_tests[i].di,
 		       decode_tests[i].res);
 	}
+
+	gnutls_global_deinit();
 }
diff --git a/tests/pkcs7-cat-parse.c b/tests/pkcs7-cat-parse.c
index b0e8a940f1..e74f5a7c1e 100644
--- a/tests/pkcs7-cat-parse.c
+++ b/tests/pkcs7-cat-parse.c
@@ -93,6 +93,8 @@ void doit(void)
 	gnutls_datum_t data;
 	int ret;
 
+	global_init();
+
 	gnutls_global_set_log_function(tls_log_func);
 	if (debug)
 		gnutls_global_set_log_level(6);
@@ -131,4 +133,6 @@ void doit(void)
 
 	gnutls_pkcs7_deinit(pkcs7);
 	gnutls_free(data.data);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/pkcs7-gen.c b/tests/pkcs7-gen.c
index bc7d4295a9..0d99e65376 100644
--- a/tests/pkcs7-gen.c
+++ b/tests/pkcs7-gen.c
@@ -99,6 +99,8 @@ void doit(void)
 	char *oid;
 	gnutls_datum_t data;
 
+	global_init();
+
 	gnutls_global_set_time_function(mytime);
 	gnutls_global_set_log_function(tls_log_func);
 	if (debug)
@@ -265,4 +267,6 @@ void doit(void)
 	gnutls_pkcs7_deinit(pkcs7);
 	gnutls_privkey_deinit(pkey);
 	gnutls_x509_crt_deinit(crt);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/pkcs7-verify-double-free.c b/tests/pkcs7-verify-double-free.c
index 5fa1a3ff2c..a939e54f9b 100644
--- a/tests/pkcs7-verify-double-free.c
+++ b/tests/pkcs7-verify-double-free.c
@@ -182,6 +182,8 @@ void doit(void)
 	gnutls_pkcs7_t pkcs7 = NULL;
 	gnutls_datum_t data = { (unsigned char *)"xxx", 3 };
 
+	global_init();
+
 	if (debug) {
 		gnutls_global_set_log_function(tls_log_func);
 		gnutls_global_set_log_level(4711);
@@ -214,4 +216,6 @@ void doit(void)
 	gnutls_x509_crt_deinit(ee_cert);
 	gnutls_x509_trust_list_deinit(tlist, 0);
 	gnutls_pkcs7_deinit(pkcs7);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/pkcs8-key-decode-encrypted.c b/tests/pkcs8-key-decode-encrypted.c
index 59f9768d07..2ab860278c 100644
--- a/tests/pkcs8-key-decode-encrypted.c
+++ b/tests/pkcs8-key-decode-encrypted.c
@@ -68,5 +68,9 @@ static int test_decode(void)
 
 void doit(void)
 {
+	global_init();
+
 	test_decode();
+
+	gnutls_global_deinit();
 }
diff --git a/tests/pkcs8-key-decode.c b/tests/pkcs8-key-decode.c
index f8b5b8e729..2bc614f7c1 100644
--- a/tests/pkcs8-key-decode.c
+++ b/tests/pkcs8-key-decode.c
@@ -73,5 +73,9 @@ static int test_load(void)
 
 void doit(void)
 {
+	global_init();
+
 	test_load();
+
+	gnutls_global_deinit();
 }
diff --git a/tests/privkey-derive.c b/tests/privkey-derive.c
index 6fe9ec2d86..927ed34c0c 100644
--- a/tests/privkey-derive.c
+++ b/tests/privkey-derive.c
@@ -72,6 +72,8 @@ void doit(void)
 	gnutls_datum_t secret = { NULL, 0 };
 	int ret;
 
+	global_init();
+
 	ret = gnutls_privkey_init(&privkey);
 	if (ret < 0) {
 		fail("unable to init privkey: %s\n", gnutls_strerror(ret));
@@ -111,4 +113,5 @@ void doit(void)
 	gnutls_pubkey_deinit(pubkey);
 	gnutls_privkey_deinit(privkey);
 	gnutls_free(secret.data);
+	gnutls_global_deinit();
 }
diff --git a/tests/resume-lifetime.c b/tests/resume-lifetime.c
index edc246a53a..a510201635 100644
--- a/tests/resume-lifetime.c
+++ b/tests/resume-lifetime.c
@@ -99,10 +99,6 @@ static unsigned handshake(const char *prio, unsigned t,
 	int cret = GNUTLS_E_AGAIN;
 	char buf[128];
 
-	gnutls_global_set_log_function(tls_log_func);
-	if (debug)
-		gnutls_global_set_log_level(6);
-
 	assert(gnutls_certificate_allocate_credentials(&serverx509cred) >= 0);
 	assert(gnutls_certificate_set_x509_key_mem(serverx509cred, &server_cert,
 						   &server_key,
@@ -273,10 +269,18 @@ static void start2(const char *name, const char *prio, unsigned t, unsigned s)
 
 void doit(void)
 {
+	global_init();
+
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(6);
+
 	virt_time_init();
 
 	start("TLS1.3 sanity", "NORMAL:-VERS-ALL:+VERS-TLS1.3", 64, 0);
 	start("TLS1.3 ticket extension", "NORMAL:-VERS-ALL:+VERS-TLS1.3", 5, 3);
 	start2("TLS1.3 ticket extension - expires at handshake",
 	       "NORMAL:-VERS-ALL:+VERS-TLS1.3", 2, 3);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/sanity-cpp.cpp b/tests/sanity-cpp.cpp
index b34d83d469..bb352a1e3a 100644
--- a/tests/sanity-cpp.cpp
+++ b/tests/sanity-cpp.cpp
@@ -242,5 +242,13 @@ int main(void)
 		cmocka_unit_test(tls13_handshake),
 		cmocka_unit_test(tls12_handshake)
 	};
-	return cmocka_run_group_tests(tests, NULL, NULL);
+	int ret;
+
+	gnutls_global_init();
+
+	ret = cmocka_run_group_tests(tests, NULL, NULL);
+
+	gnutls_global_deinit();
+
+	return ret;
 }
diff --git a/tests/session-rdn-read.c b/tests/session-rdn-read.c
index 800e5c6c1f..ecbcf822d3 100644
--- a/tests/session-rdn-read.c
+++ b/tests/session-rdn-read.c
@@ -98,12 +98,6 @@ static void start(const char *prio)
 
 	success("testing %s\n", prio);
 
-	/* General init. */
-	global_init();
-	gnutls_global_set_log_function(tls_log_func);
-	if (debug)
-		gnutls_global_set_log_level(2);
-
 	/* Init server */
 	gnutls_certificate_allocate_credentials(&serverx509cred);
 
@@ -163,8 +157,6 @@ static void start(const char *prio)
 	gnutls_certificate_free_credentials(serverx509cred);
 	gnutls_certificate_free_credentials(clientx509cred);
 
-	gnutls_global_deinit();
-
 	reset_buffers();
 }
 
@@ -180,10 +172,18 @@ static void find_dn(const gnutls_datum_t *cert, gnutls_datum_t *dn)
 
 void doit(void)
 {
+	/* General init. */
+	global_init();
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(2);
+
 	find_dn(CA1_PTR, &ca_dn[0]);
 	find_dn(CA2_PTR, &ca_dn[1]);
 	start("NORMAL:-VERS-TLS-ALL:+VERS-TLS1.3");
 	start("NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2");
 	gnutls_free(ca_dn[0].data);
 	gnutls_free(ca_dn[1].data);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/slow/crypto.c b/tests/slow/crypto.c
index aa760c3b67..26656a8813 100644
--- a/tests/slow/crypto.c
+++ b/tests/slow/crypto.c
@@ -12,6 +12,8 @@
 int main(int argc, char **argv)
 {
 	char output[64];
+	gnutls_global_init();
 	assert(gnutls_hash_fast(GNUTLS_DIG_SHA256, "abc", 3, output) >= 0);
+	gnutls_global_deinit();
 	return 0;
 }
diff --git a/tests/tls13-compat-mode.c b/tests/tls13-compat-mode.c
index f3d59220ba..3f4eb4a3f4 100644
--- a/tests/tls13-compat-mode.c
+++ b/tests/tls13-compat-mode.c
@@ -130,8 +130,12 @@ static void test(const char *name, bool client_compat, bool server_compat)
 
 void doit(void)
 {
+	global_init();
+
 	test("client compat, server compat", true, true);
 	test("client compat, server non-compat", true, false);
 	test("client non-compat, server compat", false, true);
 	test("client non-compat, server non-compat", false, false);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/tls13-early-start.c b/tests/tls13-early-start.c
index 194b798a54..7472d11559 100644
--- a/tests/tls13-early-start.c
+++ b/tests/tls13-early-start.c
@@ -191,11 +191,6 @@ static void try_with_key_ks(const char *name, const char *client_prio,
 	int cret = GNUTLS_E_AGAIN, version;
 	const char *err;
 
-	/* General init. */
-	gnutls_global_set_log_function(tls_log_func);
-	if (debug)
-		gnutls_global_set_log_level(6);
-
 	reset_buffers();
 	/* Init server */
 	gnutls_certificate_allocate_credentials(&serverx509cred);
@@ -318,6 +313,13 @@ static void try_with_key(const char *name, const char *client_prio,
 
 void doit(void)
 {
+	/* General init. */
+	global_init();
+
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(6);
+
 	/* TLS 1.3 no client cert: early start expected */
 	try_ok("TLS 1.3 with ffdhe2048 rsa no-cli-cert",
 	       "NORMAL:-VERS-ALL:+VERS-TLS1.3:-GROUP-ALL:+GROUP-FFDHE2048");
@@ -354,4 +356,6 @@ void doit(void)
 			  "NORMAL:-VERS-ALL:+VERS-TLS1.3:-KX-ALL:+ECDHE-RSA",
 			  &server_ca3_localhost_ecc_cert, &server_ca3_ecc_key,
 			  NULL, NULL, 0);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/tls13/key_update_multiple.c b/tests/tls13/key_update_multiple.c
index 61d4acb217..e2fa80f430 100644
--- a/tests/tls13/key_update_multiple.c
+++ b/tests/tls13/key_update_multiple.c
@@ -93,12 +93,6 @@ static void run(const char *name, bool exceed_limit)
 
 	success("%s\n", name);
 
-	/* General init. */
-	global_init();
-	gnutls_global_set_log_function(tls_log_func);
-	if (debug)
-		gnutls_global_set_log_level(9);
-
 	/* Init server */
 	assert(gnutls_certificate_allocate_credentials(&scred) >= 0);
 	assert(gnutls_certificate_set_x509_key_mem(
@@ -216,14 +210,21 @@ static void run(const char *name, bool exceed_limit)
 	gnutls_certificate_free_credentials(scred);
 	gnutls_certificate_free_credentials(ccred);
 
-	gnutls_global_deinit();
 	reset_buffers();
 }
 
 void doit(void)
 {
+	/* General init. */
+	global_init();
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(9);
+
 	virt_time_init();
 
 	run("not exceeding limit", 0);
 	run("exceeding limit", 1);
+
+	gnutls_global_deinit();
 }
diff --git a/tests/x509-dn-decode-compat.c b/tests/x509-dn-decode-compat.c
index ac82055aad..0badd8df48 100644
--- a/tests/x509-dn-decode-compat.c
+++ b/tests/x509-dn-decode-compat.c
@@ -162,8 +162,12 @@ void doit(void)
 {
 	unsigned i;
 
+	global_init();
+
 	for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
 		decode(tests[i].name, &tests[i].raw, tests[i].str,
 		       tests[i].compat_str);
 	}
+
+	gnutls_global_deinit();
 }
diff --git a/tests/x509-dn-decode.c b/tests/x509-dn-decode.c
index e3ec0f5a9e..6145d5ef79 100644
--- a/tests/x509-dn-decode.c
+++ b/tests/x509-dn-decode.c
@@ -290,6 +290,8 @@ void doit(void)
 {
 	unsigned i;
 
+	global_init();
+
 	for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
 		decode(tests[i].name, &tests[i].raw, tests[i].str,
 		       tests[i].compat_str);
@@ -303,4 +305,6 @@ void doit(void)
 		encode(encode_tests[i].name, &encode_tests[i].raw,
 		       encode_tests[i].str, encode_tests[i].failure);
 	}
+
+	gnutls_global_deinit();
 }
diff --git a/tests/x509-upnconstraint.c b/tests/x509-upnconstraint.c
index 61ec078105..ec8ea6e8b5 100644
--- a/tests/x509-upnconstraint.c
+++ b/tests/x509-upnconstraint.c
@@ -232,6 +232,8 @@ void doit(void)
 	gnutls_datum_t issuingca_datum = { (void *)_issuingca,
 					   sizeof(_issuingca) - 1 };
 
+	global_init();
+
 	gnutls_x509_crt_init(&issuingca);
 
 	ret = gnutls_x509_crt_import(issuingca, &issuingca_datum,
@@ -267,6 +269,8 @@ void doit(void)
 	gnutls_x509_crt_deinit(issuingca);
 
 	success("UPN constraints tests completed successfully\n");
+
+	gnutls_global_deinit();
 }
 
 /* The following cert is the root CA that signed the intermediate CA used in
diff --git a/tests/x509-verify-duplicate.c b/tests/x509-verify-duplicate.c
index 48e3d1bb29..6c7e1bcb28 100644
--- a/tests/x509-verify-duplicate.c
+++ b/tests/x509-verify-duplicate.c
@@ -169,6 +169,8 @@ void doit(void)
 	gnutls_datum_t cert = { (unsigned char *)cert_pem,
 				sizeof(cert_pem) - 1 };
 
+	global_init();
+
 	CHECK(gnutls_x509_crt_list_import2(&certs, &certs_size, &cert,
 					   GNUTLS_X509_FMT_PEM, 0));
 	CHECK(gnutls_x509_trust_list_init(&tl, 0));
@@ -183,4 +185,6 @@ void doit(void)
 	for (i = 0; i < certs_size; ++i)
 		gnutls_x509_crt_deinit(certs[i]);
 	gnutls_free(certs);
+
+	gnutls_global_deinit();
 }