diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2020-07-22 10:40:55 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2020-07-22 10:40:55 +1000 |
commit | 90409da6a520812b0266fcb1303175406dea81fe (patch) | |
tree | a9d4fcbae513c3daaa7dabb9dce681e30465bd90 /providers/implementations/ciphers/cipher_tdes_common.c | |
parent | 77174598920a05826a28d8a0bd87a3af43d3f4d8 (diff) | |
download | openssl-new-90409da6a520812b0266fcb1303175406dea81fe.tar.gz |
Fix provider cipher reinit issue
Fixes #12405
Fixes #12377
Calling Init()/Update() and then Init()/Update() again gave a different result when using the same key and iv.
Cipher modes that were using ctx->num were not resetting this value, this includes OFB, CFB & CTR.
The fix is to reset this value during the ciphers einit() and dinit() methods.
Most ciphers go thru a generic method so one line fixes most cases.
Add test for calling EVP_EncryptInit()/EVP_EncryptUpdate() multiple times for all ciphers.
Ciphers should return the same value for both updates.
DES3-WRAP does not since it uses a random in the update.
CCM modes currently also fail on the second update (This also happens in 1_1_1).
Fix memory leak in AES_OCB cipher if EVP_EncryptInit is called multiple times.
Fix AES_SIV cipher dup_ctx and init.
Calling EVP_CIPHER_init multiple times resulted in a memory leak in the siv.
Fixing this leak also showed that the dup ctx was not working for siv mode.
Note: aes_siv_cleanup() can not be used by aes_siv_dupctx() as it clears data
that is required for the decrypt (e.g the tag).
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12413)
Diffstat (limited to 'providers/implementations/ciphers/cipher_tdes_common.c')
-rw-r--r-- | providers/implementations/ciphers/cipher_tdes_common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/providers/implementations/ciphers/cipher_tdes_common.c b/providers/implementations/ciphers/cipher_tdes_common.c index 6cdc88749c..d2379f741b 100644 --- a/providers/implementations/ciphers/cipher_tdes_common.c +++ b/providers/implementations/ciphers/cipher_tdes_common.c @@ -57,6 +57,7 @@ static int tdes_init(void *vctx, const unsigned char *key, size_t keylen, { PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx; + ctx->num = 0; ctx->enc = enc; if (iv != NULL) { |