mirror of
https://github.com/openssl/openssl.git
synced 2024-11-21 01:15:20 +08:00
f75abcc0f0
Fixes #10438 issue found by clusterfuzz/ossfuzz The dest was getting a copy of the src structure which contained a pointer that should point to an offset inside itself - because of the copy it was pointing to the original structure. The setup for a ctx is mainly done by the initkey method in the PROV_CIPHER_HW structure. Because of this it makes sense that the structure should also contain a copyctx method that is use to resolve any pointers that need to be setup. A dup_ctx has been added to the cipher_enc tests in evp_test. It does a dup after setup and then frees the original ctx. This detects any floating pointers in the duplicated context that were pointing back to the freed ctx. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10443)
68 lines
2.6 KiB
C
68 lines
2.6 KiB
C
/*
|
|
* Copyright 2001-2019 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 "cipher_camellia.h"
|
|
#include <openssl/camellia.h>
|
|
|
|
static int cipher_hw_camellia_initkey(PROV_CIPHER_CTX *dat,
|
|
const unsigned char *key, size_t keylen)
|
|
{
|
|
int ret, mode = dat->mode;
|
|
PROV_CAMELLIA_CTX *adat = (PROV_CAMELLIA_CTX *)dat;
|
|
CAMELLIA_KEY *ks = &adat->ks.ks;
|
|
|
|
dat->ks = ks;
|
|
ret = Camellia_set_key(key, keylen * 8, ks);
|
|
if (ret < 0) {
|
|
ERR_raise(ERR_LIB_PROV, EVP_R_ARIA_KEY_SETUP_FAILED);
|
|
return 0;
|
|
}
|
|
if (dat->enc || (mode != EVP_CIPH_ECB_MODE && mode != EVP_CIPH_CBC_MODE)) {
|
|
dat->block = (block128_f) Camellia_encrypt;
|
|
dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
|
|
(cbc128_f) Camellia_cbc_encrypt : NULL;
|
|
} else {
|
|
dat->block = (block128_f) Camellia_decrypt;
|
|
dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
|
|
(cbc128_f) Camellia_cbc_encrypt : NULL;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
IMPLEMENT_CIPHER_HW_COPYCTX(cipher_hw_camellia_copyctx, PROV_CAMELLIA_CTX)
|
|
|
|
# if defined(SPARC_CMLL_CAPABLE)
|
|
# include "cipher_camellia_hw_t4.inc"
|
|
# else
|
|
/* The generic case */
|
|
# define PROV_CIPHER_HW_declare(mode)
|
|
# define PROV_CIPHER_HW_select(mode)
|
|
# endif /* SPARC_CMLL_CAPABLE */
|
|
|
|
#define PROV_CIPHER_HW_camellia_mode(mode) \
|
|
static const PROV_CIPHER_HW camellia_##mode = { \
|
|
cipher_hw_camellia_initkey, \
|
|
cipher_hw_generic_##mode, \
|
|
cipher_hw_camellia_copyctx \
|
|
}; \
|
|
PROV_CIPHER_HW_declare(mode) \
|
|
const PROV_CIPHER_HW *PROV_CIPHER_HW_camellia_##mode(size_t keybits) \
|
|
{ \
|
|
PROV_CIPHER_HW_select(mode) \
|
|
return &camellia_##mode; \
|
|
}
|
|
|
|
PROV_CIPHER_HW_camellia_mode(cbc)
|
|
PROV_CIPHER_HW_camellia_mode(ecb)
|
|
PROV_CIPHER_HW_camellia_mode(ofb128)
|
|
PROV_CIPHER_HW_camellia_mode(cfb128)
|
|
PROV_CIPHER_HW_camellia_mode(cfb1)
|
|
PROV_CIPHER_HW_camellia_mode(cfb8)
|
|
PROV_CIPHER_HW_camellia_mode(ctr)
|