[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f52f2c1ae8f2ec378c5a20fb4104aa38edbabfcb (commit)
      from  41a6fa74e6c95ea3edd0baf2616839ca7cb62c3d (commit)


- Log -----------------------------------------------------------------
commit f52f2c1ae8f2ec378c5a20fb4104aa38edbabfcb
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 20 15:33:21 2018 +0200

    /dev/crypto engine: add missing RC4 parameter
    
    Fixes #7280
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7281)

-----------------------------------------------------------------------

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 },