Move digest types to a new file

4 files changed, 113 insertions, 103 deletions

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 8f0a771ff3..f8a7774815 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -74,6 +74,7 @@ LIBDIR = $(PRIVDIR)/lib/$(TARGET)
 CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o \
 	$(OBJDIR)/atoms$(TYPEMARKER).o \
 	$(OBJDIR)/bn$(TYPEMARKER).o \
+	$(OBJDIR)/digest$(TYPEMARKER).o \
 	$(OBJDIR)/engine$(TYPEMARKER).o \
 	$(OBJDIR)/rsa$(TYPEMARKER).o
 CALLBACK_OBJS = $(OBJDIR)/crypto_callback$(TYPEMARKER).o
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 7c1f8d7509..491c82916f 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -26,6 +26,7 @@
 #include "common.h"
 
 #include "bn.h"
+#include "digest.h"
 #include "engine.h"
 #include "rsa.h"
 
@@ -91,7 +92,6 @@ static ERL_NIF_TERM poly1305_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 
 /* helpers */
 static void init_algorithms_types(ErlNifEnv*);
-static void init_digest_types(ErlNifEnv* env);
 static void init_cipher_types(ErlNifEnv* env);
 #ifdef HAVE_EC
 static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg);
@@ -192,85 +192,6 @@ struct hmac_context
 };
 static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context*);
 
-struct digest_type_t {
-    union {
-	const char*  str;        /* before init, NULL for end-of-table */
-	ERL_NIF_TERM atom;       /* after init, 'false' for end-of-table */
-    }type;
-    union {
-	const EVP_MD* (*funcp)(void);  /* before init, NULL if notsup */
-	const EVP_MD* p;               /* after init, NULL if notsup */
-    }md;
-};
-
-static struct digest_type_t digest_types[] =
-{
-    {{"md4"}, {&EVP_md4}},
-    {{"md5"}, {&EVP_md5}},
-    {{"ripemd160"}, {&EVP_ripemd160}},
-    {{"sha"}, {&EVP_sha1}},
-    {{"sha224"},
-#ifdef HAVE_SHA224
-     {&EVP_sha224}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha256"},
-#ifdef HAVE_SHA256
-     {&EVP_sha256}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha384"},
-#ifdef HAVE_SHA384
-     {&EVP_sha384}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha512"},
-#ifdef HAVE_SHA512
-     {&EVP_sha512}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha3_224"},
-#ifdef HAVE_SHA3_224
-     {&EVP_sha3_224}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha3_256"},
-#ifdef HAVE_SHA3_256
-     {&EVP_sha3_256}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha3_384"},
-#ifdef HAVE_SHA3_384
-     {&EVP_sha3_384}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha3_512"},
-#ifdef HAVE_SHA3_512
-     {&EVP_sha3_512}
-#else
-     {NULL}
-#endif
-    },
-
-    {{NULL}}
-};
-
-static struct digest_type_t* get_digest_type(ERL_NIF_TERM type);
-
 struct cipher_type_t {
     union {
 	const char* str;    /* before init */
@@ -2216,18 +2137,6 @@ static ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
     return ret;
 }
 
-static void init_digest_types(ErlNifEnv* env)
-{
-    struct digest_type_t* p = digest_types;
-
-    for (p = digest_types; p->type.str; p++) {
-	p->type.atom = enif_make_atom(env, p->type.str);
-	if (p->md.funcp)
-	    p->md.p = p->md.funcp();
-    }
-    p->type.atom = atom_false;  /* end marker */
-}
-
 static void init_cipher_types(ErlNifEnv* env)
 {
     struct cipher_type_t* p = cipher_types;
@@ -2240,17 +2149,6 @@ static void init_cipher_types(ErlNifEnv* env)
     p->type.atom = atom_false; /* end marker */
 }
 
-static struct digest_type_t* get_digest_type(ERL_NIF_TERM type)
-{
-    struct digest_type_t* p = NULL;
-    for (p = digest_types; p->type.atom != atom_false; p++) {
-	if (type == p->type.atom) {
-	    return p;
-	}
-    }
-    return NULL;
-}
-
 static struct cipher_type_t* get_cipher_type(ERL_NIF_TERM type, size_t key_len)
 {
     struct cipher_type_t* p = NULL;
diff --git a/lib/crypto/c_src/digest.c b/lib/crypto/c_src/digest.c
new file mode 100644
index 0000000000..ba879ab464
--- /dev/null
+++ b/lib/crypto/c_src/digest.c
@@ -0,0 +1,91 @@
+#include "digest.h"
+
+static struct digest_type_t digest_types[] =
+{
+    {{"md4"}, {&EVP_md4}},
+    {{"md5"}, {&EVP_md5}},
+    {{"ripemd160"}, {&EVP_ripemd160}},
+    {{"sha"}, {&EVP_sha1}},
+    {{"sha224"},
+#ifdef HAVE_SHA224
+     {&EVP_sha224}
+#else
+     {NULL}
+#endif
+    },
+    {{"sha256"},
+#ifdef HAVE_SHA256
+     {&EVP_sha256}
+#else
+     {NULL}
+#endif
+    },
+    {{"sha384"},
+#ifdef HAVE_SHA384
+     {&EVP_sha384}
+#else
+     {NULL}
+#endif
+    },
+    {{"sha512"},
+#ifdef HAVE_SHA512
+     {&EVP_sha512}
+#else
+     {NULL}
+#endif
+    },
+    {{"sha3_224"},
+#ifdef HAVE_SHA3_224
+     {&EVP_sha3_224}
+#else
+     {NULL}
+#endif
+    },
+    {{"sha3_256"},
+#ifdef HAVE_SHA3_256
+     {&EVP_sha3_256}
+#else
+     {NULL}
+#endif
+    },
+    {{"sha3_384"},
+#ifdef HAVE_SHA3_384
+     {&EVP_sha3_384}
+#else
+     {NULL}
+#endif
+    },
+    {{"sha3_512"},
+#ifdef HAVE_SHA3_512
+     {&EVP_sha3_512}
+#else
+     {NULL}
+#endif
+    },
+
+    {{NULL}}
+};
+
+void init_digest_types(ErlNifEnv* env)
+{
+    struct digest_type_t* p = digest_types;
+
+    for (p = digest_types; p->type.str; p++) {
+	p->type.atom = enif_make_atom(env, p->type.str);
+	if (p->md.funcp)
+	    p->md.p = p->md.funcp();
+    }
+    p->type.atom = atom_false;  /* end marker */
+}
+
+struct digest_type_t* get_digest_type(ERL_NIF_TERM type)
+{
+    struct digest_type_t* p = NULL;
+    for (p = digest_types; p->type.atom != atom_false; p++) {
+	if (type == p->type.atom) {
+	    return p;
+	}
+    }
+    return NULL;
+}
+
diff --git a/lib/crypto/c_src/digest.h b/lib/crypto/c_src/digest.h
new file mode 100644
index 0000000000..bd17f58bbf
--- /dev/null
+++ b/lib/crypto/c_src/digest.h
@@ -0,0 +1,20 @@
+#ifndef E_DIGEST_H__
+#define E_DIGEST_H__ 1
+
+#include "common.h"
+
+struct digest_type_t {
+    union {
+	const char*  str;        /* before init, NULL for end-of-table */
+	ERL_NIF_TERM atom;       /* after init, 'false' for end-of-table */
+    }type;
+    union {
+	const EVP_MD* (*funcp)(void);  /* before init, NULL if notsup */
+	const EVP_MD* p;               /* after init, NULL if notsup */
+    }md;
+};
+
+void init_digest_types(ErlNifEnv* env);
+struct digest_type_t* get_digest_type(ERL_NIF_TERM type);
+
+#endif /* E_DIGEST_H__ */