From 1abc5cac5dcd40349001ce2bf2530a02ab5ec918 Mon Sep 17 00:00:00 2001
From: Doug Hogan <hogand@users.noreply.github.com>
Date: Thu, 20 Dec 2018 02:05:43 -0800
Subject: Move EDDSA functionality to a new file

---
 lib/crypto/c_src/Makefile.in |  1 +
 lib/crypto/c_src/crypto.c    | 31 +------------------------------
 lib/crypto/c_src/eddsa.c     | 31 +++++++++++++++++++++++++++++++
 lib/crypto/c_src/eddsa.h     | 10 ++++++++++
 4 files changed, 43 insertions(+), 30 deletions(-)
 create mode 100644 lib/crypto/c_src/eddsa.c
 create mode 100644 lib/crypto/c_src/eddsa.h

(limited to 'lib')

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 2c29fb8006..4ff080a327 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -78,6 +78,7 @@ CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o \
 	$(OBJDIR)/cmac$(TYPEMARKER).o \
 	$(OBJDIR)/dh$(TYPEMARKER).o \
 	$(OBJDIR)/digest$(TYPEMARKER).o \
+	$(OBJDIR)/eddsa$(TYPEMARKER).o \
 	$(OBJDIR)/engine$(TYPEMARKER).o \
 	$(OBJDIR)/hash$(TYPEMARKER).o \
 	$(OBJDIR)/hmac$(TYPEMARKER).o \
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 98197fa3fb..3d0c8a63b6 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -30,6 +30,7 @@
 #include "cmac.h"
 #include "dh.h"
 #include "digest.h"
+#include "eddsa.h"
 #include "engine.h"
 #include "hash.h"
 #include "hmac.h"
@@ -1512,36 +1513,6 @@ static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
     return ret;
 }
 
-#ifdef HAVE_EDDSA
- static int get_eddsa_key(ErlNifEnv* env, int public, ERL_NIF_TERM key, EVP_PKEY **pkey)
-{
-    /* key=[K] */
-    ERL_NIF_TERM head, tail, tail2, algo;
-    ErlNifBinary bin;
-    int type;
-
-    if (!enif_get_list_cell(env, key, &head, &tail)
-	|| !enif_inspect_binary(env, head, &bin)
-        || !enif_get_list_cell(env, tail, &algo, &tail2)
-        || !enif_is_empty_list(env, tail2)) {
-	return 0;
-    }
-    if (algo == atom_ed25519) type = EVP_PKEY_ED25519;
-    else if (algo == atom_ed448) type = EVP_PKEY_ED448;
-    else
-        return 0;
-
-    if (public)
-        *pkey = EVP_PKEY_new_raw_public_key(type, NULL, bin.data, bin.size);
-    else 
-        *pkey = EVP_PKEY_new_raw_private_key(type, NULL, bin.data, bin.size);
-
-    if (!pkey)
-        return 0;
-    return 1;
-}
-#endif
-
 static int get_dss_private_key(ErlNifEnv* env, ERL_NIF_TERM key, DSA *dsa)
 {
     /* key=[P,Q,G,KEY] */
diff --git a/lib/crypto/c_src/eddsa.c b/lib/crypto/c_src/eddsa.c
new file mode 100644
index 0000000000..5e9853f8e5
--- /dev/null
+++ b/lib/crypto/c_src/eddsa.c
@@ -0,0 +1,31 @@
+#include "eddsa.h"
+
+#ifdef HAVE_EDDSA
+int get_eddsa_key(ErlNifEnv* env, int public, ERL_NIF_TERM key, EVP_PKEY **pkey)
+{
+    /* key=[K] */
+    ERL_NIF_TERM head, tail, tail2, algo;
+    ErlNifBinary bin;
+    int type;
+
+    if (!enif_get_list_cell(env, key, &head, &tail)
+	|| !enif_inspect_binary(env, head, &bin)
+        || !enif_get_list_cell(env, tail, &algo, &tail2)
+        || !enif_is_empty_list(env, tail2)) {
+	return 0;
+    }
+    if (algo == atom_ed25519) type = EVP_PKEY_ED25519;
+    else if (algo == atom_ed448) type = EVP_PKEY_ED448;
+    else
+        return 0;
+
+    if (public)
+        *pkey = EVP_PKEY_new_raw_public_key(type, NULL, bin.data, bin.size);
+    else 
+        *pkey = EVP_PKEY_new_raw_private_key(type, NULL, bin.data, bin.size);
+
+    if (!pkey)
+        return 0;
+    return 1;
+}
+#endif
diff --git a/lib/crypto/c_src/eddsa.h b/lib/crypto/c_src/eddsa.h
new file mode 100644
index 0000000000..d24d25613f
--- /dev/null
+++ b/lib/crypto/c_src/eddsa.h
@@ -0,0 +1,10 @@
+#ifndef E_EDDSA_H__
+#define E_EDDSA_H__ 1
+
+#include "common.h"
+
+#ifdef HAVE_EDDSA
+int get_eddsa_key(ErlNifEnv* env, int public, ERL_NIF_TERM key, EVP_PKEY **pkey);
+#endif
+
+#endif /* E_EDDSA_H__ */
-- 
cgit v1.2.3