diff options
| author | Tomas Mraz <tomas@openssl.org> | 2022-05-20 16:27:51 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-05-23 08:50:42 +0200 |
| commit | 7a9e93dda58118c0fb1bade8fe915306b845325b (patch) | |
| tree | 0280c785c9885ef5e0bd0b2250d48441c526156f | |
| parent | Fix a crash in asn1_item_embed_new (diff) | |
| download | openssl-7a9e93dda58118c0fb1bade8fe915306b845325b.tar.xz openssl-7a9e93dda58118c0fb1bade8fe915306b845325b.zip | |
Fix regression in default key length for Blowfish CFB and OFB ciphers
Fixes #18359
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18362)
| -rw-r--r-- | providers/implementations/ciphers/cipher_blowfish.c | 4 | ||||
| -rw-r--r-- | providers/implementations/include/prov/implementations.h | 4 | ||||
| -rw-r--r-- | providers/legacyprov.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/providers/implementations/ciphers/cipher_blowfish.c b/providers/implementations/ciphers/cipher_blowfish.c index 9566f044a4..e3b08ddbe4 100644 --- a/providers/implementations/ciphers/cipher_blowfish.c +++ b/providers/implementations/ciphers/cipher_blowfish.c @@ -55,6 +55,6 @@ IMPLEMENT_var_keylen_cipher(blowfish, BLOWFISH, ecb, ECB, BF_FLAGS, 128, 64, 0, /* bf_cbc_functions */ IMPLEMENT_var_keylen_cipher(blowfish, BLOWFISH, cbc, CBC, BF_FLAGS, 128, 64, 64, block) /* bf_ofb_functions */ -IMPLEMENT_var_keylen_cipher(blowfish, BLOWFISH, ofb64, OFB, BF_FLAGS, 64, 8, 64, stream) +IMPLEMENT_var_keylen_cipher(blowfish, BLOWFISH, ofb64, OFB, BF_FLAGS, 128, 8, 64, stream) /* bf_cfb_functions */ -IMPLEMENT_var_keylen_cipher(blowfish, BLOWFISH, cfb64, CFB, BF_FLAGS, 64, 8, 64, stream) +IMPLEMENT_var_keylen_cipher(blowfish, BLOWFISH, cfb64, CFB, BF_FLAGS, 128, 8, 64, stream) diff --git a/providers/implementations/include/prov/implementations.h b/providers/implementations/include/prov/implementations.h index d7b591cf72..5740028287 100644 --- a/providers/implementations/include/prov/implementations.h +++ b/providers/implementations/include/prov/implementations.h @@ -156,8 +156,8 @@ extern const OSSL_DISPATCH ossl_camellia128ctr_functions[]; #ifndef OPENSSL_NO_BF extern const OSSL_DISPATCH ossl_blowfish128ecb_functions[]; extern const OSSL_DISPATCH ossl_blowfish128cbc_functions[]; -extern const OSSL_DISPATCH ossl_blowfish64ofb64_functions[]; -extern const OSSL_DISPATCH ossl_blowfish64cfb64_functions[]; +extern const OSSL_DISPATCH ossl_blowfish128ofb64_functions[]; +extern const OSSL_DISPATCH ossl_blowfish128cfb64_functions[]; #endif /* OPENSSL_NO_BF */ #ifndef OPENSSL_NO_IDEA extern const OSSL_DISPATCH ossl_idea128ecb_functions[]; diff --git a/providers/legacyprov.c b/providers/legacyprov.c index ddfd555910..1280ca4313 100644 --- a/providers/legacyprov.c +++ b/providers/legacyprov.c @@ -112,8 +112,8 @@ static const OSSL_ALGORITHM legacy_ciphers[] = { #ifndef OPENSSL_NO_BF ALG(PROV_NAMES_BF_ECB, ossl_blowfish128ecb_functions), ALG(PROV_NAMES_BF_CBC, ossl_blowfish128cbc_functions), - ALG(PROV_NAMES_BF_OFB, ossl_blowfish64ofb64_functions), - ALG(PROV_NAMES_BF_CFB, ossl_blowfish64cfb64_functions), + ALG(PROV_NAMES_BF_OFB, ossl_blowfish128ofb64_functions), + ALG(PROV_NAMES_BF_CFB, ossl_blowfish128cfb64_functions), #endif /* OPENSSL_NO_BF */ #ifndef OPENSSL_NO_IDEA ALG(PROV_NAMES_IDEA_ECB, ossl_idea128ecb_functions), |