mirror of
https://github.com/openssl/openssl.git
synced 2024-12-15 06:01:37 +08:00
90409da6a5
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)
38 lines
1.4 KiB
C
38 lines
1.4 KiB
C
/*
|
|
* Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include "prov/ciphercommon.h"
|
|
#include "crypto/aes_platform.h"
|
|
#include "crypto/siv.h"
|
|
|
|
typedef struct prov_cipher_hw_aes_siv_st {
|
|
int (*initkey)(void *ctx, const uint8_t *key, size_t keylen);
|
|
int (*cipher)(void *ctx, unsigned char *out, const unsigned char *in,
|
|
size_t len);
|
|
void (*setspeed)(void *ctx, int speed);
|
|
int (*settag)(void *ctx, const unsigned char *tag, size_t tagl);
|
|
void (*cleanup)(void *ctx);
|
|
int (*dupctx)(void *src, void *dst);
|
|
} PROV_CIPHER_HW_AES_SIV;
|
|
|
|
typedef struct prov_siv_ctx_st {
|
|
unsigned int mode; /* The mode that we are using */
|
|
unsigned int enc : 1; /* Set to 1 if we are encrypting or 0 otherwise */
|
|
uint64_t flags;
|
|
size_t keylen; /* The input keylength (twice the alg key length) */
|
|
size_t taglen; /* the taglen is the same as the sivlen */
|
|
SIV128_CONTEXT siv;
|
|
EVP_CIPHER *ctr; /* These are fetched - so we need to free them */
|
|
EVP_CIPHER *cbc;
|
|
const PROV_CIPHER_HW_AES_SIV *hw;
|
|
OPENSSL_CTX *libctx;
|
|
} PROV_AES_SIV_CTX;
|
|
|
|
const PROV_CIPHER_HW_AES_SIV *PROV_CIPHER_HW_aes_siv(size_t keybits);
|