mirror of
https://github.com/openssl/openssl.git
synced 2025-01-06 13:26:43 +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)
127 lines
3.3 KiB
C
127 lines
3.3 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
|
|
*/
|
|
|
|
/*
|
|
* DES low level APIs are deprecated for public use, but still ok for internal
|
|
* use.
|
|
*/
|
|
#include "internal/deprecated.h"
|
|
|
|
#include "prov/ciphercommon.h"
|
|
#include "cipher_tdes.h"
|
|
#include <openssl/rand.h>
|
|
#include "prov/implementations.h"
|
|
#include "prov/providercommonerr.h"
|
|
|
|
void *tdes_newctx(void *provctx, int mode, size_t kbits, size_t blkbits,
|
|
size_t ivbits, uint64_t flags, const PROV_CIPHER_HW *hw)
|
|
{
|
|
PROV_TDES_CTX *tctx = OPENSSL_zalloc(sizeof(*tctx));
|
|
|
|
if (tctx != NULL)
|
|
cipher_generic_initkey(tctx, kbits, blkbits, ivbits, mode, flags, hw,
|
|
provctx);
|
|
return tctx;
|
|
}
|
|
|
|
void *tdes_dupctx(void *ctx)
|
|
{
|
|
PROV_TDES_CTX *in = (PROV_TDES_CTX *)ctx;
|
|
PROV_TDES_CTX *ret = OPENSSL_malloc(sizeof(*ret));
|
|
|
|
if (ret == NULL) {
|
|
ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE);
|
|
return NULL;
|
|
}
|
|
in->base.hw->copyctx(&ret->base, &in->base);
|
|
|
|
return ret;
|
|
}
|
|
|
|
void tdes_freectx(void *vctx)
|
|
{
|
|
PROV_TDES_CTX *ctx = (PROV_TDES_CTX *)vctx;
|
|
|
|
cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
|
|
OPENSSL_clear_free(ctx, sizeof(*ctx));
|
|
}
|
|
|
|
static int tdes_init(void *vctx, const unsigned char *key, size_t keylen,
|
|
const unsigned char *iv, size_t ivlen, int enc)
|
|
{
|
|
PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
|
|
|
|
ctx->num = 0;
|
|
ctx->enc = enc;
|
|
|
|
if (iv != NULL) {
|
|
if (!cipher_generic_initiv(ctx, iv, ivlen))
|
|
return 0;
|
|
}
|
|
|
|
if (key != NULL) {
|
|
if (keylen != ctx->keylen) {
|
|
ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEYLEN);
|
|
return 0;
|
|
}
|
|
return ctx->hw->init(ctx, key, ctx->keylen);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
int tdes_einit(void *vctx, const unsigned char *key, size_t keylen,
|
|
const unsigned char *iv, size_t ivlen)
|
|
{
|
|
return tdes_init(vctx, key, keylen, iv, ivlen, 1);
|
|
}
|
|
|
|
int tdes_dinit(void *vctx, const unsigned char *key, size_t keylen,
|
|
const unsigned char *iv, size_t ivlen)
|
|
{
|
|
return tdes_init(vctx, key, keylen, iv, ivlen, 0);
|
|
}
|
|
|
|
CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_START(tdes)
|
|
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_RANDOM_KEY, NULL, 0),
|
|
CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(tdes)
|
|
|
|
static int tdes_generatekey(PROV_CIPHER_CTX *ctx, void *ptr)
|
|
{
|
|
|
|
DES_cblock *deskey = ptr;
|
|
size_t kl = ctx->keylen;
|
|
|
|
if (kl == 0 || RAND_priv_bytes_ex(ctx->libctx, ptr, kl) <= 0)
|
|
return 0;
|
|
DES_set_odd_parity(deskey);
|
|
if (kl >= 16)
|
|
DES_set_odd_parity(deskey + 1);
|
|
if (kl >= 24) {
|
|
DES_set_odd_parity(deskey + 2);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int tdes_get_ctx_params(void *vctx, OSSL_PARAM params[])
|
|
{
|
|
PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
|
|
OSSL_PARAM *p;
|
|
|
|
if (!cipher_generic_get_ctx_params(vctx, params))
|
|
return 0;
|
|
|
|
p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_RANDOM_KEY);
|
|
if (p != NULL && !tdes_generatekey(ctx, p->data)) {
|
|
ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GENERATE_KEY);
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|