From a9047c6a8d15583f1d8c2e2b32faaa63d2f66f85 Mon Sep 17 00:00:00 2001 From: Rahim Kanji Date: Fri, 29 Dec 2023 13:28:31 +0500 Subject: [PATCH] Updated x509cache.patch --- deps/mariadb-client-library/x509cache.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/deps/mariadb-client-library/x509cache.patch b/deps/mariadb-client-library/x509cache.patch index 66bc5fd721..08233ad408 100644 --- a/deps/mariadb-client-library/x509cache.patch +++ b/deps/mariadb-client-library/x509cache.patch @@ -35,7 +35,7 @@ index 916024a8..79564a10 100644 int STDCALL mysql_set_server_option(MYSQL *mysql, diff --git libmariadb/secure/openssl.c libmariadb/secure/openssl.c -index 67d90c6a..5f9d4572 100644 +index 67d90c6a..26938959 100644 --- libmariadb/secure/openssl.c +++ libmariadb/secure/openssl.c @@ -30,6 +30,11 @@ @@ -50,7 +50,7 @@ index 67d90c6a..5f9d4572 100644 #if defined(_WIN32) && !defined(_OPENSSL_Applink) && defined(HAVE_OPENSSL_APPLINK_C) #include #endif -@@ -70,6 +75,81 @@ +@@ -70,6 +75,82 @@ extern my_bool ma_tls_initialized; extern unsigned int mariadb_deinitialize_ssl; @@ -73,8 +73,9 @@ index 67d90c6a..5f9d4572 100644 + if(fstat(fd, &statbuf) == 0) { + unsigned char *fb = (unsigned char *)mmap(0, statbuf.st_size, PROT_READ, MAP_SHARED, fd, 0); + if (fb != MAP_FAILED) { ++ int i; + SHA1(fb, statbuf.st_size, temp); -+ for (int i=0; i < SHA_DIGEST_LENGTH; i++) { ++ for (i=0; i < SHA_DIGEST_LENGTH; i++) { + sprintf((char*)&(file_sha1[i*2]), "%02x", temp[i]); + } + munmap(fb,statbuf.st_size); @@ -132,7 +133,7 @@ index 67d90c6a..5f9d4572 100644 #define MAX_SSL_ERR_LEN 100 char tls_library_version[TLS_VERSION_LENGTH]; -@@ -331,7 +411,7 @@ static int ma_tls_set_certs(MYSQL *mysql, SSL_CTX *ctx) +@@ -331,7 +412,7 @@ static int ma_tls_set_certs(MYSQL *mysql, SSL_CTX *ctx) *keyfile= mysql->options.ssl_key; char *pw= (mysql->options.extension) ? mysql->options.extension->tls_pw : NULL; @@ -141,7 +142,7 @@ index 67d90c6a..5f9d4572 100644 /* add cipher */ if ((mysql->options.ssl_cipher && mysql->options.ssl_cipher[0] != 0)) -@@ -345,10 +425,27 @@ static int ma_tls_set_certs(MYSQL *mysql, SSL_CTX *ctx) +@@ -345,10 +426,27 @@ static int ma_tls_set_certs(MYSQL *mysql, SSL_CTX *ctx) } /* ca_file and ca_path */