diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 23:49:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 23:49:10 +0400 |
| commit | c1599821a55ac4f59c5c799480a07913e1c26daa (patch) | |
| tree | 0c064252ad3959fcd53b0f06a40b98d691fe070e /mysys_ssl/my_crypt.cc | |
| parent | 624dd71b9419555eca8baadc695e3376de72286f (diff) | |
| parent | c4fd167d5a740f67ee5287a9b05b5383403b9ed0 (diff) | |
| download | mariadb-git-c1599821a55ac4f59c5c799480a07913e1c26daa.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'mysys_ssl/my_crypt.cc')
| -rw-r--r-- | mysys_ssl/my_crypt.cc | 16 |
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; } }; |