diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-26 19:32:28 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-26 19:32:28 +0400 |
| commit | 9bc32256427373e5bfa78f17c5854ac4e6a2fc31 (patch) | |
| tree | 748fd55866bcbc4de5eee1c078ac8d2cad5b6fd7 /mysys_ssl/yassl.cc | |
| parent | 77b2f55f61a4e3ba642049a01651c92bfb0a7d9d (diff) | |
| parent | ca7cf69cb13285585922722063af888b957580ee (diff) | |
| download | mariadb-git-9bc32256427373e5bfa78f17c5854ac4e6a2fc31.tar.gz | |
Merge tag 'mariadb-10.2.6' into bb-10.2-ext
Diffstat (limited to 'mysys_ssl/yassl.cc')
| -rw-r--r-- | mysys_ssl/yassl.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mysys_ssl/yassl.cc b/mysys_ssl/yassl.cc index 5146c9a9abc..23376c82b4f 100644 --- a/mysys_ssl/yassl.cc +++ b/mysys_ssl/yassl.cc @@ -44,7 +44,6 @@ typedef struct int buf_len; int final_used; uchar tao_buf[sizeof(TaoCrypt::AES)]; // TaoCrypt::AES object - uchar oiv[TaoCrypt::AES::BLOCK_SIZE]; // original IV uchar buf[TaoCrypt::AES::BLOCK_SIZE]; // last partial input block uchar final[TaoCrypt::AES::BLOCK_SIZE]; // last decrypted (output) block } EVP_CIPHER_CTX; @@ -97,10 +96,7 @@ static int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, : TaoCrypt::DECRYPTION, cipher->mode); TAO(ctx)->SetKey(key, cipher->key_len); if (iv) - { TAO(ctx)->SetIV(iv); - memcpy(ctx->oiv, iv, TaoCrypt::AES::BLOCK_SIZE); - } ctx->encrypt= enc; ctx->key_len= cipher->key_len; ctx->flags|= cipher->mode == TaoCrypt::CBC ? EVP_CIPH_CBC_MODE : EVP_CIPH_ECB_MODE; |