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 585e44c38e1afb3402a4087b4dec9ba6d8f4faf0..67537733c2bbbd9cd7ef6e66128abcc0cb24371d 100644 (file)
--- 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 9ccae54d4ea441709a50971e84999053188ee131..f2e9b1154d88f080a1ff02538650bd3d203dce5f 100644 (file)
--- 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 9876faf0438bbce99825d827a938245dec1aecfd..4098588ca4056d5e0ee54afc15606e04382104f6 100644 (file)
--- 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 0ec7370964c78954d92d7db495c6c5336fb8a71e..1c65158a840d8e4159453354443f482229f1294d 100644 (file)
--- 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 f8d40ad867f36c0dc601edead96e69b0222c4d08..8c078ff8c850d3053fa7dc9e8ea6458be26b93d6 100644 (file)
--- 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 5c5f4a4c793bc0aae0f2f910b18abce9b6425ad4..d2aee542d5127e7137de2edf459b8590b01d757d 100644 (file)
--- 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 fdceb2188dacffddc38e0c39a3782ed06e07684f..bc9aa1b7c91c8aa3d3dd340efd9afaaeb6b0cab2 100644 (file)
--- 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 2d70f03b4b698effd5f6c2c9f601d37017ba9629..4b179cd0d8b77fc53bbda52e18c80af38f8bdb85 100644 (file)
--- 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 4eacb99a0ba48e70e15af7b601552f3ce881e81d..a94aeff292c2971306546ee3549681b1255d6b92 100644 (file)
--- 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 0168dcd0cb3268a13d9103f699f93dc997b40e85..467f011d9818e74f82e40edebf837ad580eb3c9f 100644 (file)
--- 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 fd3f750ed4fd72c7e86fd1a3d6277d0cffc6ad88..f1182916de300b44e68f2929fa8e5cfcad390020 100644 (file)
--- 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 b78fe600035cf4782ab8c77104831c706d32cdfa..34c14f01b879d696d24fbbac146bdfeb3ef72d4c 100644 (file)
--- 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 3417439518a2834f143d189f42a9612d5725ad76..9016967bde72d1eb535bb57fad72359597d531fa 100644 (file)
--- 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 8afb5931bcfc6f48e5fb97ccb08881db4b59f20f..b17ebce1447658b5323e9a42e84dacc5c06717a3 100644 (file)
--- 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 85f309ebab5a5250fe4ea623001fc9b99e28d329..71216b700d3cc82bcfa76407b139b0aad24d6551 100644 (file)
--- 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 91e2608bcd9cb3fdc39e3f232a7eaf3d318c5b62..98c741b6986a393854804e89df511b8a486ec14d 100644 (file)
--- 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 793bfbfd305466daf37790e8a46e21c8e787dba0..2a1e053f1562f5b2bc6b1dcbfbc3d4d38d205450 100644 (file)
--- 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 b47a45a0d635e4514bad0f506458df5f6fca1d9c..7d8412db97dbf757139439858677c77afb47bea9 100644 (file)
--- 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 b0e8a940f1079ef23a4716dcf0d301564a5c792a..e74f5a7c1edc9bd46dd1d3bd43dcf42b098ab043 100644 (file)
--- 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 bc7d4295a9e198c001b40ee9d453508463d863b2..0d99e653769504ad6a139c144beb20a05d667e8e 100644 (file)
--- 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 5fa1a3ff2cf7c4e5b8946a4eb1202e1549c73244..a939e54f9b519c8139c3bd5ec8b3c3a36a71e7ab 100644 (file)
--- 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 59f9768d07290f83074fc6dc1fd337c021d9a3d5..2ab860278c426a05625b357fba966aab3ff30b19 100644 (file)
--- 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 f8b5b8e729f76de59120662d03e91b163100f35f..2bc614f7c14ea772ec4dfcea434fbfc2d95cd0af 100644 (file)
--- 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 6fe9ec2d8658241b2b996cee6aeb6f99f8bf8bd1..927ed34c0c8ef44e9399c00540668567d879d729 100644 (file)
--- 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 edc246a53a4907de32caea3cf3015614297aba28..a510201635c50483a3a6dd3b7021bae4954a560d 100644 (file)
--- 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 b34d83d4694797914c5f5d70b5f211f149aa139a..bb352a1e3a2efe2167ded3264f5334adfebe3f8e 100644 (file)
--- 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 800e5c6c1f1cd2c4bf05c2d801a30167fe112e37..ecbcf822d36ea3935bb957b222d8084126d757c9 100644 (file)
--- 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 aa760c3b677778566805ed0a9b3ed553c36be705..26656a8813de859955d8a143b8d6ee6d27b1cec5 100644 (file)
--- 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 f3d59220ba80cf1752274571420155b6ac8cee47..3f4eb4a3f48782165de7553e454a3ad7f96200b5 100644 (file)
--- 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 194b798a543916cb12d57fa91610569480bdafbf..7472d11559c9845476a1ee5d8c7f43569973caee 100644 (file)
--- 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 61d4acb2177b095b5ece9a71188a0d3394c149d9..e2fa80f430058e9d436a615eda19b127e20beb1d 100644 (file)
--- 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 ac82055aad64b89c55b3a1e502bd19afb81b0210..0badd8df48d798aeb25f3e9ad198f7c7d0ef23d6 100644 (file)
--- 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 e3ec0f5a9e75bd23a427b3c1a2472df2141cc474..6145d5ef7945fa55253b84fd2dabfd966c809472 100644 (file)
--- 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 61ec078105177431641f26523da39702c3720f04..ec8ea6e8b516398f4ecc01266a87fad6ca500408 100644 (file)
--- 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 48e3d1bb2987f413fdccccd3cc7fd8962fb6c1b7..6c7e1bcb2830e4b95efbf219f7e36e9016f47dc3 100644 (file)
--- 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();
 }