From 121efebb92f81ac4136c63de79fa88b2b6cedfa2 Mon Sep 17 00:00:00 2001
From: Doug Hogan <hogand@users.noreply.github.com>
Date: Thu, 20 Dec 2018 02:08:56 -0800
Subject: Move xor functionality to a new file

---
 lib/crypto/c_src/Makefile.in |  1 +
 lib/crypto/c_src/crypto.c    | 23 +----------------------
 lib/crypto/c_src/math.c      | 23 +++++++++++++++++++++++
 lib/crypto/c_src/math.h      |  8 ++++++++
 4 files changed, 33 insertions(+), 22 deletions(-)
 create mode 100644 lib/crypto/c_src/math.c
 create mode 100644 lib/crypto/c_src/math.h

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 3f45e881b4..99325930e8 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -88,6 +88,7 @@ CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o \
 	$(OBJDIR)/hash$(TYPEMARKER).o \
 	$(OBJDIR)/hmac$(TYPEMARKER).o \
 	$(OBJDIR)/info$(TYPEMARKER).o \
+	$(OBJDIR)/math$(TYPEMARKER).o \
 	$(OBJDIR)/poly1305$(TYPEMARKER).o \
 	$(OBJDIR)/rand$(TYPEMARKER).o \
 	$(OBJDIR)/rc4$(TYPEMARKER).o \
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index ae30525646..993ce7e5b5 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -40,6 +40,7 @@
 #include "hash.h"
 #include "hmac.h"
 #include "info.h"
+#include "math.h"
 #include "poly1305.h"
 #include "rand.h"
 #include "rc4.h"
@@ -55,7 +56,6 @@ static void unload(ErlNifEnv* env, void* priv_data);
 static ERL_NIF_TERM info_fips(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM enable_fips_mode(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM pkey_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM pkey_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -678,27 +678,6 @@ static ERL_NIF_TERM make_badarg_maybe(ErlNifEnv* env)
 }
 #endif
 
-static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data1, Data2) */
-    ErlNifBinary d1, d2;
-    unsigned char* ret_ptr;
-    int i;
-    ERL_NIF_TERM ret;
-
-    if (!enif_inspect_iolist_as_binary(env,argv[0], &d1)
-	|| !enif_inspect_iolist_as_binary(env,argv[1], &d2)
-	|| d1.size != d2.size) {
-	return enif_make_badarg(env);
-    }
-    ret_ptr = enif_make_new_binary(env, d1.size, &ret);
-
-    for (i=0; i<d1.size; i++) {
-	ret_ptr[i] = d1.data[i] ^ d2.data[i];
-    }
-    CONSUME_REDS(env,d1);
-    return ret;
-}
-
 #if defined(HAVE_EC)
 static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
 {
diff --git a/lib/crypto/c_src/math.c b/lib/crypto/c_src/math.c
new file mode 100644
index 0000000000..ae0de56720
--- /dev/null
+++ b/lib/crypto/c_src/math.c
@@ -0,0 +1,23 @@
+#include "math.h"
+
+ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Data1, Data2) */
+    ErlNifBinary d1, d2;
+    unsigned char* ret_ptr;
+    int i;
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env,argv[0], &d1)
+	|| !enif_inspect_iolist_as_binary(env,argv[1], &d2)
+	|| d1.size != d2.size) {
+	return enif_make_badarg(env);
+    }
+    ret_ptr = enif_make_new_binary(env, d1.size, &ret);
+
+    for (i=0; i<d1.size; i++) {
+	ret_ptr[i] = d1.data[i] ^ d2.data[i];
+    }
+    CONSUME_REDS(env,d1);
+    return ret;
+}
+
diff --git a/lib/crypto/c_src/math.h b/lib/crypto/c_src/math.h
new file mode 100644
index 0000000000..e486d867f6
--- /dev/null
+++ b/lib/crypto/c_src/math.h
@@ -0,0 +1,8 @@
+#ifndef E_MATH_H__
+#define E_MATH_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_MATH_H__ */
-- 
cgit v1.2.3