mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect default keysize for CAST ofb and cfb modes.

Browse Source 
Fixes #11459

It was incorrectly using 8 bytes instead of 16 as the default.
This was verified by expanding the macros used in e_cast.c.
The issue occurs if EVP_CIPHER_CTX_set_key_length() is not called.
evp_test.c hides this issue as it always calls EVP_CIPHER_CTX_set_key_length() before
using EVP_CipherInit_ex(...., key, ..).

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11707)
This commit is contained in:
Shane Lontis 2020-05-02 13:51:35 +10:00
parent b756626a37
commit 95cf64404c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
providers/implementations/ciphers/cipher_cast5.c
View File

@ -49,7 +49,7 @@ static void *cast5_dupctx(void *ctx)
IMPLEMENT_var_keylen_cipher(cast5, CAST, ecb, ECB, CAST5_FLAGS, 128, 64, 0, block) IMPLEMENT_var_keylen_cipher(cast5, CAST, ecb, ECB, CAST5_FLAGS, 128, 64, 0, block)
/* cast5128cbc_functions */ /* cast5128cbc_functions */
IMPLEMENT_var_keylen_cipher(cast5, CAST, cbc, CBC, CAST5_FLAGS, 128, 64, 64, block) IMPLEMENT_var_keylen_cipher(cast5, CAST, cbc, CBC, CAST5_FLAGS, 128, 64, 64, block)
/* cast564ofb64_functions */ /* cast5128ofb64_functions */
IMPLEMENT_var_keylen_cipher(cast5, CAST, ofb64, OFB, CAST5_FLAGS, 64, 8, 64, stream) IMPLEMENT_var_keylen_cipher(cast5, CAST, ofb64, OFB, CAST5_FLAGS, 128, 8, 64, stream)
/* cast564cfb64_functions */ /* cast5128cfb64_functions */
IMPLEMENT_var_keylen_cipher(cast5, CAST, cfb64, CFB, CAST5_FLAGS, 64, 8, 64, stream) IMPLEMENT_var_keylen_cipher(cast5, CAST, cfb64, CFB, CAST5_FLAGS, 128, 8, 64, stream)

4
providers/implementations/include/prov/implementations.h
View File

@ -148,8 +148,8 @@ extern const OSSL_DISPATCH idea128cfb64_functions[];
#ifndef OPENSSL_NO_CAST #ifndef OPENSSL_NO_CAST
extern const OSSL_DISPATCH cast5128ecb_functions[]; extern const OSSL_DISPATCH cast5128ecb_functions[];
extern const OSSL_DISPATCH cast5128cbc_functions[]; extern const OSSL_DISPATCH cast5128cbc_functions[];
extern const OSSL_DISPATCH cast564ofb64_functions[]; extern const OSSL_DISPATCH cast5128ofb64_functions[];
extern const OSSL_DISPATCH cast564cfb64_functions[]; extern const OSSL_DISPATCH cast5128cfb64_functions[];
#endif /* OPENSSL_NO_CAST */ #endif /* OPENSSL_NO_CAST */
#ifndef OPENSSL_NO_SEED #ifndef OPENSSL_NO_SEED
extern const OSSL_DISPATCH seed128ecb_functions[]; extern const OSSL_DISPATCH seed128ecb_functions[];

4
providers/legacyprov.c
View File

@ -79,8 +79,8 @@ static const OSSL_ALGORITHM legacy_ciphers[] = {
#ifndef OPENSSL_NO_CAST #ifndef OPENSSL_NO_CAST
ALG("CAST5-ECB", cast5128ecb_functions), ALG("CAST5-ECB", cast5128ecb_functions),
ALG("CAST5-CBC:CAST-CBC:CAST", cast5128cbc_functions), ALG("CAST5-CBC:CAST-CBC:CAST", cast5128cbc_functions),
ALG("CAST5-OFB", cast564ofb64_functions), ALG("CAST5-OFB", cast5128ofb64_functions),
ALG("CAST5-CFB", cast564cfb64_functions), ALG("CAST5-CFB", cast5128cfb64_functions),
#endif /* OPENSSL_NO_CAST */ #endif /* OPENSSL_NO_CAST */
#ifndef OPENSSL_NO_BF #ifndef OPENSSL_NO_BF
ALG("BF-ECB", blowfish128ecb_functions), ALG("BF-ECB", blowfish128ecb_functions),