From: Matt Caswell Date: Sat, 5 Oct 2019 01:42:32 +0000 (+1000) Subject: RC4 is not a block cipher X-Git-Tag: openssl-3.0.0-alpha1~1207 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=74997e7eedd094b40183f0643c5744e77fbd393f;p=oweals%2Fopenssl.git RC4 is not a block cipher RC4 is a stream cipher therefore EVP_CIPHER_CTX_block_size() should return 1. This fixes a test failure in ssl_test_old when enable-weak-ssl-ciphers has been configured. Reviewed-by: Richard Levitte Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/10090) --- diff --git a/providers/default/ciphers/cipher_rc4.c b/providers/default/ciphers/cipher_rc4.c index 9418c141f6..d81b776bc2 100644 --- a/providers/default/ciphers/cipher_rc4.c +++ b/providers/default/ciphers/cipher_rc4.c @@ -82,6 +82,6 @@ const OSSL_DISPATCH alg##kbits##_functions[] = { \ }; /* rc440_functions */ -IMPLEMENT_cipher(rc4, RC4, EVP_CIPH_VARIABLE_LENGTH, 40, 64, 0, stream) +IMPLEMENT_cipher(rc4, RC4, EVP_CIPH_VARIABLE_LENGTH, 40, 8, 0, stream) /* rc4128_functions */ -IMPLEMENT_cipher(rc4, RC4, EVP_CIPH_VARIABLE_LENGTH, 128, 64, 0, stream) +IMPLEMENT_cipher(rc4, RC4, EVP_CIPH_VARIABLE_LENGTH, 128, 8, 0, stream)