diff --git a/include/ssl_compat.h b/include/ssl_compat.h
index 9541a68cbdc..7b4a828a4d9 100644
--- a/include/ssl_compat.h
+++ b/include/ssl_compat.h
@@ -24,8 +24,8 @@
 #define HAVE_OPENSSL11 1
 #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
 #define ERR_remove_state(X) ERR_clear_error()
-#define EVP_CIPHER_CTX_SIZE 176
-#define EVP_MD_CTX_SIZE 48
+#define EVP_CIPHER_CTX_SIZE 200
+#define EVP_MD_CTX_SIZE 80
 #undef EVP_MD_CTX_init
 #define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0)
 #undef EVP_CIPHER_CTX_init
diff --git a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c
index e0f3d646ca9..340ba34ba78 100644
--- a/mysys_ssl/openssl.c
+++ b/mysys_ssl/openssl.c
@@ -33,7 +33,7 @@ int check_openssl_compatibility()
 #include <openssl/evp.h>
 
 static uint testing;
-size_t alloc_size, alloc_count;
+static size_t alloc_size, alloc_count;
 
 static void *coc_malloc(size_t size, const char *f __attribute__((unused)),
                                              int l __attribute__((unused)))