File 1637-crypto-Slightly-change-the-3-DES-symbol-ha... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1637-crypto-Slightly-change-the-3-DES-symbol-handling.patch of Package erlang (Revision c1f86aaf67efb2869925ebff9d99dcbc)

Currently displaying revision c1f86aaf67efb2869925ebff9d99dcbc , Show latest

From abf7f84c2f77bb07dbdbb8a29b9d41f1f24c5f14 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 7 May 2020 12:06:32 +0200
Subject: [PATCH 07/17] crypto: Slightly change the 3-DES symbol handling

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

diff --git a/lib/crypto/c_src/cipher.c b/lib/crypto/c_src/cipher.c
index 284ea0ba81..67cc614ffd 100644
--- a/lib/crypto/c_src/cipher.c
+++ b/lib/crypto/c_src/cipher.c
@@ -20,12 +20,6 @@
 
 #include "cipher.h"
 
-#ifdef HAVE_DES
-#define COND_NO_DES_PTR(Ptr) (Ptr)
-#else
-#define COND_NO_DES_PTR(Ptr) (NULL)
-#endif
-
 #define NOT_AEAD {{0,0,0}}
 
 static struct cipher_type_t cipher_types[] =
@@ -35,19 +29,31 @@ static struct cipher_type_t cipher_types[] =
 #else
     {{"rc2_cbc"}, {NULL}, 0, NO_FIPS_CIPHER, NOT_AEAD},
 #endif
+
 #ifdef HAVE_RC4
     {{"rc4"},     {&EVP_rc4}, 0, NO_FIPS_CIPHER, NOT_AEAD},
 #else
     {{"rc4"},     {NULL}, 0, NO_FIPS_CIPHER, NOT_AEAD},
 #endif
-    {{"des_cbc"}, {COND_NO_DES_PTR(&EVP_des_cbc)}, 0, NO_FIPS_CIPHER, NOT_AEAD},
-    {{"des_cfb"}, {COND_NO_DES_PTR(&EVP_des_cfb8)}, 0, NO_FIPS_CIPHER, NOT_AEAD},
-    {{"des_ecb"}, {COND_NO_DES_PTR(&EVP_des_ecb)}, 0, NO_FIPS_CIPHER | ECB_BUG_0_9_8L, NOT_AEAD},
 
-    {{"des_ede3_cbc"}, {COND_NO_DES_PTR(&EVP_des_ede3_cbc)}, 0, 0, NOT_AEAD},
+#ifdef HAVE_DES
+    {{"des_cbc"}, {&EVP_des_cbc},  0, NO_FIPS_CIPHER},
+    {{"des_cfb"}, {&EVP_des_cfb8}, 0, NO_FIPS_CIPHER},
+    {{"des_ecb"}, {&EVP_des_ecb},  0, NO_FIPS_CIPHER | ECB_BUG_0_9_8L},
+#else
+    {{"des_cbc"}, {NULL}, 0, 0},
+    {{"des_cfb"}, {NULL}, 0, 0},
+    {{"des_ecb"}, {NULL}, 0, 0},
+#endif
+
+#ifdef HAVE_DES_ede3_cbc
+    {{"des_ede3_cbc"}, {&EVP_des_ede3_cbc}, 0, 0},
+#else
+    {{"des_ede3_cbc"}, {NULL}, 0, 0},
+#endif
 
-#ifdef HAVE_DES_ede3_cfb_encrypt
-    {{"des_ede3_cfb"}, {COND_NO_DES_PTR(&EVP_des_ede3_cfb8)}, 0, 0, NOT_AEAD},
+#ifdef HAVE_DES_ede3_cfb
+    {{"des_ede3_cfb"}, {&EVP_des_ede3_cfb8}, 0, 0},
 #else
     {{"des_ede3_cfb"}, {NULL}, 0, 0, NOT_AEAD},
 #endif
diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h
index 8fbb1f959c..13263bcf22 100644
--- a/lib/crypto/c_src/openssl_config.h
+++ b/lib/crypto/c_src/openssl_config.h
@@ -153,9 +153,6 @@
     && !defined(OPENSSL_NO_SHA512) && defined(NID_sha512)
 # define HAVE_SHA512
 #endif
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,7,'e')
-# define HAVE_DES_ede3_cfb_encrypt
-#endif
 
 // SHA3:
 #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,1)
@@ -189,6 +186,14 @@
 # define HAVE_DES
 #endif
 
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,7,'e')
+# define HAVE_DES_ede3_cfb
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,7,'e')
+# define HAVE_DES_ede3_cbc
+#endif
+
 #ifndef OPENSSL_NO_DH
 # define HAVE_DH
 #endif
-- 
2.31.1

Places

File 1637-crypto-Slightly-change-the-3-DES-symbol-handling.patch of Package erlang (Revision c1f86aaf67efb2869925ebff9d99dcbc)

Places