mirror of
https://github.com/openssl/openssl.git
synced 2024-12-27 06:21:43 +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)
52 lines
2.0 KiB
C
52 lines
2.0 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_aria.h"
|
|
|
|
static int cipher_hw_aria_initkey(PROV_CIPHER_CTX *dat,
|
|
const unsigned char *key, size_t keylen)
|
|
{
|
|
int ret, mode = dat->mode;
|
|
PROV_ARIA_CTX *adat = (PROV_ARIA_CTX *)dat;
|
|
ARIA_KEY *ks = &adat->ks.ks;
|
|
|
|
if (dat->enc || (mode != EVP_CIPH_ECB_MODE && mode != EVP_CIPH_CBC_MODE))
|
|
ret = aria_set_encrypt_key(key, keylen * 8, ks);
|
|
else
|
|
ret = aria_set_decrypt_key(key, keylen * 8, ks);
|
|
if (ret < 0) {
|
|
ERR_raise(ERR_LIB_PROV, EVP_R_ARIA_KEY_SETUP_FAILED);
|
|
return 0;
|
|
}
|
|
dat->ks = ks;
|
|
dat->block = (block128_f)aria_encrypt;
|
|
return 1;
|
|
}
|
|
|
|
IMPLEMENT_CIPHER_HW_COPYCTX(cipher_hw_aria_copyctx, PROV_ARIA_CTX)
|
|
|
|
# define PROV_CIPHER_HW_aria_mode(mode) \
|
|
static const PROV_CIPHER_HW aria_##mode = { \
|
|
cipher_hw_aria_initkey, \
|
|
cipher_hw_chunked_##mode, \
|
|
cipher_hw_aria_copyctx \
|
|
}; \
|
|
const PROV_CIPHER_HW *PROV_CIPHER_HW_aria_##mode(size_t keybits) \
|
|
{ \
|
|
return &aria_##mode; \
|
|
}
|
|
|
|
PROV_CIPHER_HW_aria_mode(cbc)
|
|
PROV_CIPHER_HW_aria_mode(ecb)
|
|
PROV_CIPHER_HW_aria_mode(ofb128)
|
|
PROV_CIPHER_HW_aria_mode(cfb128)
|
|
PROV_CIPHER_HW_aria_mode(cfb1)
|
|
PROV_CIPHER_HW_aria_mode(cfb8)
|
|
PROV_CIPHER_HW_aria_mode(ctr)
|