File 2591-crypto-Prepare-Re-arrange-if-defs.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2591-crypto-Prepare-Re-arrange-if-defs.patch of Package erlang (Revision 3624bc22143be68439892ea1c7edb9a8)

Currently displaying revision 3624bc22143be68439892ea1c7edb9a8 , Show latest

From adb5cf1e323a43e89517b32d97d04471ea13927a Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 30 Mar 2022 11:58:36 +0200
Subject: [PATCH 1/7] crypto: Prepare: Re-arrange if-defs

---
 lib/crypto/c_src/ecdh.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/crypto/c_src/ecdh.c b/lib/crypto/c_src/ecdh.c
index 9133878b58..092b59e2df 100644
--- a/lib/crypto/c_src/ecdh.c
+++ b/lib/crypto/c_src/ecdh.c
@@ -21,14 +21,18 @@
 #include "ecdh.h"
 #include "ec.h"
 
-/*
-  (_OthersPublicKey, _MyPrivateKey)
-  (_OthersPublicKey, _MyEC_Point)
-*/
+#if !defined(HAVE_EC)
+ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+/* (OtherPublicKey, {CurveDef,CurveName}, My) */
+{
+    return EXCP_NOTSUP_N(env, 0, "EC not supported");
+}
+
+#else
+
 ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 /* (OtherPublicKey, Curve, My) */
 {
-#if defined(HAVE_EC)
     ERL_NIF_TERM ret = atom_undefined;
     unsigned char *p;
     EC_KEY* key = NULL;
@@ -80,8 +84,5 @@ ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
         EC_KEY_free(key);
 
     return ret;
-
-#else
-    return EXCP_NOTSUP_N(env, 0, "EC not supported");
 #endif
 }
-- 
2.35.3

Places

File 2591-crypto-Prepare-Re-arrange-if-defs.patch of Package erlang (Revision 3624bc22143be68439892ea1c7edb9a8)

Places