File 2261-crypto-Rename-HAVE_ED_CURVE_DH-HAVE_EDDH-and.patch of Package erlang

From a1fd7aa0efd189a5ac530443bc2947e399da6e45 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 31 Mar 2020 14:01:27 +0200
Subject: [PATCH 1/3] crypto: Rename HAVE_ED_CURVE_DH -> HAVE_EDDH and

add 'ifdef DH' in the definition
---
 lib/crypto/c_src/algorithms.c     | 2 +-
 lib/crypto/c_src/atoms.c          | 4 ++--
 lib/crypto/c_src/atoms.h          | 2 +-
 lib/crypto/c_src/evp.c            | 4 ++--
 lib/crypto/c_src/openssl_config.h | 4 +++-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/crypto/c_src/algorithms.c b/lib/crypto/c_src/algorithms.c
index adabad77ea..09f6d0b3e5 100644
--- a/lib/crypto/c_src/algorithms.c
+++ b/lib/crypto/c_src/algorithms.c
@@ -200,7 +200,7 @@ void init_algorithms_types(ErlNifEnv* env)
     algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ed25519");
     algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ed448");
 #endif
-#ifdef HAVE_ED_CURVE_DH
+#ifdef HAVE_EDDH
     algo_curve[algo_curve_cnt++] = enif_make_atom(env,"x25519");
     algo_curve[algo_curve_cnt++] = enif_make_atom(env,"x448");
 #endif
diff --git a/lib/crypto/c_src/atoms.c b/lib/crypto/c_src/atoms.c
index 97c13de317..735749a56c 100644
--- a/lib/crypto/c_src/atoms.c
+++ b/lib/crypto/c_src/atoms.c
@@ -92,7 +92,7 @@ ERL_NIF_TERM atom_rsa;
 ERL_NIF_TERM atom_dss;
 ERL_NIF_TERM atom_ecdsa;
 
-#ifdef HAVE_ED_CURVE_DH
+#ifdef HAVE_EDDH
 ERL_NIF_TERM atom_x25519;
 ERL_NIF_TERM atom_x448;
 ERL_NIF_TERM atom_ed25519;
@@ -230,7 +230,7 @@ int init_atoms(ErlNifEnv *env, const ERL_NIF_TERM fips_mode, const ERL_NIF_TERM
     atom_dss = enif_make_atom(env,"dss");
     atom_ecdsa = enif_make_atom(env,"ecdsa");
 
-#ifdef HAVE_ED_CURVE_DH
+#ifdef HAVE_EDDH
     atom_x25519 = enif_make_atom(env,"x25519");
     atom_x448 = enif_make_atom(env,"x448");
     atom_ed25519 = enif_make_atom(env,"ed25519");
diff --git a/lib/crypto/c_src/atoms.h b/lib/crypto/c_src/atoms.h
index aae47ef2c8..dd41227cec 100644
--- a/lib/crypto/c_src/atoms.h
+++ b/lib/crypto/c_src/atoms.h
@@ -96,7 +96,7 @@ extern ERL_NIF_TERM atom_rsa;
 extern ERL_NIF_TERM atom_dss;
 extern ERL_NIF_TERM atom_ecdsa;
 
-#ifdef HAVE_ED_CURVE_DH
+#ifdef HAVE_EDDH
 extern ERL_NIF_TERM atom_x25519;
 extern ERL_NIF_TERM atom_x448;
 extern ERL_NIF_TERM atom_ed25519;
diff --git a/lib/crypto/c_src/evp.c b/lib/crypto/c_src/evp.c
index fcd5d3313c..7491db3d57 100644
--- a/lib/crypto/c_src/evp.c
+++ b/lib/crypto/c_src/evp.c
@@ -23,7 +23,7 @@
 ERL_NIF_TERM evp_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
     /*    (Curve, PeerBin, MyBin) */
 {
-#ifdef HAVE_ED_CURVE_DH
+#ifdef HAVE_EDDH
     ERL_NIF_TERM ret;
     int type;
     EVP_PKEY_CTX *ctx = NULL;
@@ -101,7 +101,7 @@ ERL_NIF_TERM evp_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 ERL_NIF_TERM evp_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 /* (Curve) */
 {
-#ifdef HAVE_ED_CURVE_DH
+#ifdef HAVE_EDDH
     int type;
     EVP_PKEY_CTX *ctx = NULL;
     EVP_PKEY *pkey = NULL;
diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h
index 1cb1291f1c..fd8b699a59 100644
--- a/lib/crypto/c_src/openssl_config.h
+++ b/lib/crypto/c_src/openssl_config.h
@@ -221,7 +221,9 @@
 #if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1) -7) \
     && !defined(HAS_LIBRESSL) \
     && defined(HAVE_EC)
-# define HAVE_ED_CURVE_DH
+# ifdef HAVE_DH
+#   define HAVE_EDDH
+# endif
 # if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1))
 #   define HAVE_EDDSA
 # endif
-- 
2.16.4