diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2022-06-01 23:25:13 -0500 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2022-06-02 00:30:29 -0500 |
| commit | de3ce5e283c8d28b0e8a0c7927b2219a3348cad4 (patch) | |
| tree | e4fee54581140738f022dc3e78852773444ebad0 /databases/freetds/files/patch-src_tds_tls.c | |
| parent | lang/solidity: Unbreak (diff) | |
databases/freetds: Update version 1.3.10=>1.3.11
Relnotes: https://github.com/FreeTDS/freetds/releases/tag/v1.3.11
Diffstat (limited to 'databases/freetds/files/patch-src_tds_tls.c')
| -rw-r--r-- | databases/freetds/files/patch-src_tds_tls.c | 70 |
1 files changed, 5 insertions, 65 deletions
diff --git a/databases/freetds/files/patch-src_tds_tls.c b/databases/freetds/files/patch-src_tds_tls.c index 35612e6faff3..028370fc1025 100644 --- a/databases/freetds/files/patch-src_tds_tls.c +++ b/databases/freetds/files/patch-src_tds_tls.c @@ -1,4 +1,4 @@ ---- src/tds/tls.c.orig 2021-08-31 09:00:01 UTC +--- src/tds/tls.c.orig 2022-05-31 06:46:53 UTC +++ src/tds/tls.c @@ -53,6 +53,10 @@ #include <sys/socket.h> @@ -11,19 +11,11 @@ #include <freetds/tds.h> #include <freetds/utils/string.h> #include <freetds/tls.h> -@@ -63,7 +67,7 @@ - - /** - * \addtogroup network -- * @{ -+ * @{ - */ - - #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) -@@ -75,6 +79,15 @@ +@@ -74,6 +78,15 @@ + #define SSL_PUSH_ARGS gnutls_transport_ptr_t ptr, const void *data, size_t len #define SSL_PTR ptr #else - ++ +#ifdef LIBRESSL_VERSION_NUMBER +#if LIBRESSL_VERSION_NUMBER < 0x2070000FL +static pthread_mutex_t *openssllocks; @@ -32,58 +24,6 @@ +#endif +#define TLS_ST_OK SSL_ST_OK +#endif -+ + /* some compatibility layer */ #if !HAVE_BIO_GET_DATA - static inline void -@@ -115,7 +128,7 @@ tds_pull_func_login(SSL_PULL_ARGS) - int have; - - tdsdump_log(TDS_DBG_FUNC, "in tds_pull_func_login\n"); -- -+ - /* here we are initializing (crypted inside TDS packets) */ - - /* if we have some data send it */ -@@ -450,7 +463,7 @@ tds_ssl_init(TDSSOCKET *tds) - const char *tls_msg; - - xcred = NULL; -- session = NULL; -+ session = NULL; - tls_msg = "initializing tls"; - - if (!tls_initialized) { -@@ -826,18 +839,25 @@ check_name_match(ASN1_STRING *name, const char *hostna - static int - check_name_match(ASN1_STRING *name, const char *hostname) - { -- char *name_utf8 = NULL; -+ char *name_utf8 = NULL, *tmp_name; - int ret, name_len; - - name_len = ASN1_STRING_to_UTF8((unsigned char **) &name_utf8, name); - if (name_len < 0) - return 0; - -+ tmp_name = tds_strndup(name_utf8, name_len); -+ OPENSSL_free(name_utf8); -+ if (!tmp_name) -+ return 0; -+ -+ name_utf8 = tmp_name; -+ - tdsdump_log(TDS_DBG_INFO1, "Got name %s\n", name_utf8); - ret = 0; - if (strlen(name_utf8) == name_len && check_wildcard(name_utf8, hostname)) - ret = 1; -- OPENSSL_free(name_utf8); -+ free(name_utf8); - return ret; - } - -@@ -1095,4 +1115,3 @@ tds_ssl_deinit(TDSCONNECTION *conn) - - #endif - /** @} */ -- |