The branch OpenSSL_1_1_1-stable has been updated
via baa5cdad88590188d5547347e7fc544af40ec8ce (commit)
from ea94f19b660debfc7044c69b25418a697dec735d (commit)
- Log -----------------------------------------------------------------
commit baa5cdad88590188d5547347e7fc544af40ec8ce
Author: Richard Levitte <[email protected]>
Date: Thu Sep 20 15:33:21 2018 +0200
/dev/crypto engine: add missing RC4 parameter
Fixes #7280
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Matthias St. Pierre <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/7281)
(cherry picked from commit f52f2c1ae8f2ec378c5a20fb4104aa38edbabfcb)
-----------------------------------------------------------------------
Summary of changes:
crypto/engine/eng_devcrypto.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
index 9deaf5c..6d97e99 100644
--- a/crypto/engine/eng_devcrypto.c
+++ b/crypto/engine/eng_devcrypto.c
@@ -69,7 +69,7 @@ static const struct cipher_data_st {
{ NID_aes_192_cbc, 16, 192 / 8, 16, EVP_CIPH_CBC_MODE, CRYPTO_AES_CBC },
{ NID_aes_256_cbc, 16, 256 / 8, 16, EVP_CIPH_CBC_MODE, CRYPTO_AES_CBC },
#ifndef OPENSSL_NO_RC4
- { NID_rc4, 1, 16, 0, CRYPTO_ARC4 },
+ { NID_rc4, 1, 16, 0, EVP_CIPH_STREAM_CIPHER, CRYPTO_ARC4 },
#endif
#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_AES_CTR)
{ NID_aes_128_ctr, 16, 128 / 8, 16, EVP_CIPH_CTR_MODE, CRYPTO_AES_CTR },
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
