summaryrefslogtreecommitdiff
path: root/mysys_ssl
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2019-07-26 17:01:36 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-07-28 13:45:15 +0200
commitf61a98068695994bcfddc1146e7744f50296f9b9 (patch)
tree9674b92e652a543a3530adc04451c8c59b1881c0 /mysys_ssl
parent2792c6e7b057b18c19b506f37c35716529f80979 (diff)
downloadmariadb-git-f61a98068695994bcfddc1146e7744f50296f9b9.tar.gz
Update WolfSSL, remove older workarounds.
Diffstat (limited to 'mysys_ssl')
-rw-r--r--mysys_ssl/my_crypt.cc16
1 files changed, 0 insertions, 16 deletions
diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc
index fda909e6530..02770644259 100644
--- a/mysys_ssl/my_crypt.cc
+++ b/mysys_ssl/my_crypt.cc
@@ -88,24 +88,8 @@ public:
}
virtual int finish(uchar *dst, uint *dlen)
{
-#ifdef HAVE_WOLFSSL
- /*
- Bug in WolfSSL - sometimes EVP_CipherFinal_ex
- returns success without setting destination length
- when it should return error.
- We catch it by presetting invalid value for length,
- and checking if it has changed after the call.
-
- See https://github.com/wolfSSL/wolfssl/issues/2224
- */
- *dlen= UINT_MAX;
-#endif
if (EVP_CipherFinal_ex(ctx, dst, (int*)dlen) != 1)
return MY_AES_BAD_DATA;
-#ifdef HAVE_WOLFSSL
- if (*dlen == UINT_MAX)
- return MY_AES_BAD_DATA;
-#endif
return MY_AES_OK;
}
};