Use our constructor support for gnutls

Author: mitchcapper

build/f_gnutls_build.sh

@@ -3,15 +3,18 @@ set -e
 . "${WLB_SCRIPT_FOLDER:-$(dirname "$(readlink -f "$BASH_SOURCE")")}/helpers.sh"
 
 BLD_CONFIG_BUILD_NAME="gnutls"
-BLD_CONFIG_GNU_LIBS_ADDL=( "dirent" "getopt-gnu" "opendir" "closedir" "readdir" )
+BLD_CONFIG_GNU_LIBS_ADDL=( "dirent" "getopt-gnu" "opendir" "closedir" "readdir" "atexit" )
 BLD_CONFIG_CONFIG_CMD_ADDL=( "--with-included-unistring" )
 BLD_CONFIG_VCPKG_DEPS=( "gmp" "nettle" "brotli" "zstd" )
 BLD_CONFIG_PKG_CONFIG_MANUAL_ADD=( "gmp" )
 BLD_CONFIG_BUILD_ADDL_CFLAGS=( "-I../gl/" "-std:c++14" )
 BLD_CONFIG_BUILD_ADDL_CFLAGS_STATIC=("-DASN1_STATIC")
 BLD_CONFIG_OUR_LIB_DEPS=("libtasn1" "p11-kit" "zlib")
 BLD_CONFIG_OUR_LIB_BINS_PATH=("libtasn1")
+BLD_CONFIG_OUR_OS_FIXES_DEFINES=()
 BLD_CONFIG_BUILD_MSVC_IGNORE_WARNINGS=( "4068" "4061" "4820" "5045" "4668" "4996" )
+BLD_CONFIG_OUR_OS_FIXES_COMPILE=1
+
 
 # BLD_CONFIG_BUILD_FOLDER_NAME="myapp2"; #if you want it compiling in a diff folder
 # BLD_CONFIG_BUILD_DEBUG=1

osfixes.h

@@ -1,5 +1,9 @@
 #pragma once
 //shared polyfill library
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef _WIN32
 /*
 #define WLB_OS_BASIC_TERM
@@ -337,4 +341,8 @@ int kill(pid_t pid, int sig);
 #ifdef WLB_ALIGNED_ALLOC
 void *wlb_aligned_alloc(size_t size, size_t alignment);
 void wlb_aligned_free(void* ptr);
+#endif
+
+#ifdef __cplusplus
+}
 #endif

patches/repo_gnutls.patch

@@ -128,6 +128,89 @@ index 891c5dfd1..9b7b59ab5 100644
  {
  	_gnutls_assert_log("ASSERT: %s[%s]:%d\n", file, func, line);
  	return val;
+diff --git a/lib/global.c b/lib/global.c
+index 42d90ee9d..d9290ca69 100644
+--- a/lib/global.c
++++ b/lib/global.c
+@@ -49,11 +49,12 @@
+ #ifdef __sun
+ #pragma fini(lib_deinit)
+ #pragma init(lib_init)
+-#define _CONSTRUCTOR
+-#define _DESTRUCTOR
++#define CONSTRUCTOR(f) \
++        static void f(void)
+ #else
+-#define _CONSTRUCTOR __attribute__((constructor))
+-#define _DESTRUCTOR __attribute__((destructor))
++// this will work for windows or non windows systems
++#define WLB_CONSTRUCTOR_SUPPORT
++#include "../osfixes.h"
+ #endif
+ 
+ #ifndef _WIN32
+@@ -501,7 +502,12 @@ const char *gnutls_check_version(const char *req_version)
+ 	return NULL;
+ }
+ 
+-static void _CONSTRUCTOR lib_init(void)
++
++
++
++
++
++static void lib_deinit(void)
+ {
+ 	int ret;
+ 	const char *e;
+@@ -525,29 +531,21 @@ static void _CONSTRUCTOR lib_init(void)
+ 			return;
+ 	}
+ 
+-	ret = _gnutls_global_init(1);
+-	if (ret < 0) {
+-		fprintf(stderr, "Error in GnuTLS initialization: %s\n",
+-			gnutls_strerror(ret));
+-		_gnutls_switch_lib_state(LIB_STATE_ERROR);
+-	}
++	_gnutls_global_deinit(1);
+ }
+-
+-static void _DESTRUCTOR lib_deinit(void)
++CONSTRUCTOR(lib_init)
+ {
+ 	int ret;
+ 	const char *e;
+-
+ 	if (_gnutls_global_init_skip() != 0)
+ 		return;
+-
++	atexit(lib_deinit);
+ 	e = secure_getenv("GNUTLS_NO_IMPLICIT_INIT");
+ 	if (e != NULL) {
+ 		ret = atoi(e);
+ 		if (ret == 1)
+ 			return;
+ 	}
+-
+ 	e = secure_getenv("GNUTLS_NO_EXPLICIT_INIT");
+ 	if (e != NULL) {
+ 		_gnutls_debug_log(
+@@ -556,8 +554,12 @@ static void _DESTRUCTOR lib_deinit(void)
+ 		if (ret == 1)
+ 			return;
+ 	}
+-
+-	_gnutls_global_deinit(1);
++	ret = _gnutls_global_init(1);
++	if (ret < 0) {
++		fprintf(stderr, "Error in GnuTLS initialization: %s\n",
++			gnutls_strerror(ret));
++		_gnutls_switch_lib_state(LIB_STATE_ERROR);
++	}
+ }
+ 
+ static const struct gnutls_library_config_st _gnutls_library_config[] = {
 diff --git a/lib/x509/verify-high2.c b/lib/x509/verify-high2.c
 index dc975baeb..208b89d47 100644
 --- a/lib/x509/verify-high2.c