The branch master has been updated via 74997e7eedd094b40183f0643c5744e77fbd393f (commit) from 86913ef711751eaedc3b3676dd496d33a4fcd21d (commit)
- Log ----------------------------------------------------------------- commit 74997e7eedd094b40183f0643c5744e77fbd393f Author: Matt Caswell <m...@openssl.org> Date: Sat Oct 5 11:42:32 2019 +1000 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 <levi...@openssl.org> Reviewed-by: Shane Lontis <shane.lon...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/10090) ----------------------------------------------------------------------- Summary of changes: providers/default/ciphers/cipher_rc4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)