File 1644-crypto-Disable-RC4-if-OpenSSL-3.0-cryptoli... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1644-crypto-Disable-RC4-if-OpenSSL-3.0-cryptolib.patch of Package erlang (Revision 4b7849fc56457ee21d391a07121df2e3)

Currently displaying revision 4b7849fc56457ee21d391a07121df2e3 , Show latest

From 1f35c7bf1a4a25f01e5b88c4679733d55a2c569f Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 7 May 2020 11:41:48 +0200
Subject: [PATCH 14/17] crypto: Disable RC4 if OpenSSL 3.0 cryptolib

---
 lib/crypto/c_src/cipher.c         | 2 +-
 lib/crypto/c_src/openssl_config.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/crypto/c_src/cipher.c b/lib/crypto/c_src/cipher.c
index 67cc614ffd..b4fd0700f3 100644
--- a/lib/crypto/c_src/cipher.c
+++ b/lib/crypto/c_src/cipher.c
@@ -27,7 +27,7 @@ static struct cipher_type_t cipher_types[] =
 #ifdef HAVE_RC2
     {{"rc2_cbc"}, {&EVP_rc2_cbc}, 0, NO_FIPS_CIPHER, NOT_AEAD},
 #else
-    {{"rc2_cbc"}, {NULL}, 0, NO_FIPS_CIPHER, NOT_AEAD},
+    {{"rc2_cbc"}, {NULL}, 0, 0},
 #endif
 
 #ifdef HAVE_RC4
diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h
index 03b5cedfc3..2f68526de7 100644
--- a/lib/crypto/c_src/openssl_config.h
+++ b/lib/crypto/c_src/openssl_config.h
@@ -218,7 +218,8 @@
 # define HAVE_RC2
 #endif
 
-#ifndef OPENSSL_NO_RC4
+#if !defined(OPENSSL_NO_RC4) \
+    && OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(3,0,0)
 # define HAVE_RC4
 #endif
 
-- 
2.31.1

Places

File 1644-crypto-Disable-RC4-if-OpenSSL-3.0-cryptolib.patch of Package erlang (Revision 4b7849fc56457ee21d391a07121df2e3)

Places