Move HMAC to new files

4 files changed, 167 insertions, 152 deletions

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index f8a7774815..7bb40eb885 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -76,6 +76,7 @@ CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o \
 	$(OBJDIR)/bn$(TYPEMARKER).o \
 	$(OBJDIR)/digest$(TYPEMARKER).o \
 	$(OBJDIR)/engine$(TYPEMARKER).o \
+	$(OBJDIR)/hmac$(TYPEMARKER).o \
 	$(OBJDIR)/rsa$(TYPEMARKER).o
 CALLBACK_OBJS = $(OBJDIR)/crypto_callback$(TYPEMARKER).o
 NIF_MAKEFILE = $(PRIVDIR)/Makefile
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 491c82916f..1b1e5e71ca 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -28,6 +28,7 @@
 #include "bn.h"
 #include "digest.h"
 #include "engine.h"
+#include "hmac.h"
 #include "rsa.h"
 
 /* NIF interface declarations */
@@ -44,10 +45,6 @@ static ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]
 static ERL_NIF_TERM hash_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM hash_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM cmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM block_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_cfb_8_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -183,15 +180,6 @@ ERL_NIF_INIT(crypto,nif_funcs,load,NULL,upgrade,unload)
 #define RIPEMD160_CTX_LEN (sizeof(RIPEMD160_CTX))
 
 
-static ErlNifResourceType* hmac_context_rtype;
-struct hmac_context
-{
-    ErlNifMutex* mtx;
-    int alive;
-    HMAC_CTX* ctx;
-};
-static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context*);
-
 struct cipher_type_t {
     union {
 	const char* str;    /* before init */
@@ -1215,145 +1203,6 @@ static ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 #endif  /* OPENSSL_VERSION_NUMBER < 1.0 */
 
 
-static ERL_NIF_TERM hmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Key, Data) or (Type, Key, Data, MacSize) */
-    struct digest_type_t *digp = NULL;
-    ErlNifBinary         key, data;
-    unsigned char        buff[EVP_MAX_MD_SIZE];
-    unsigned             size = 0, req_size = 0;
-    ERL_NIF_TERM         ret;
-
-    digp = get_digest_type(argv[0]);
-    if (!digp ||
-        !enif_inspect_iolist_as_binary(env, argv[1], &key) ||
-        !enif_inspect_iolist_as_binary(env, argv[2], &data) ||
-        (argc == 4 && !enif_get_uint(env, argv[3], &req_size))) {
-        return enif_make_badarg(env);
-    }
-
-    if (!digp->md.p ||
-        !HMAC(digp->md.p,
-              key.data, key.size,
-              data.data, data.size,
-              buff, &size)) {
-        return atom_notsup;
-    }
-    ASSERT(0 < size && size <= EVP_MAX_MD_SIZE);
-    CONSUME_REDS(env, data);
-
-    if (argc == 4) {
-        if (req_size <= size) {
-            size = req_size;
-        }
-        else {
-            return enif_make_badarg(env);
-        }
-    }
-    memcpy(enif_make_new_binary(env, size, &ret), buff, size);
-    return ret;
-}
-
-static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context *obj)
-{
-    if (obj->alive) {
-	HMAC_CTX_free(obj->ctx);
-	obj->alive = 0;
-    }
-    enif_mutex_destroy(obj->mtx);
-}
-
-static ERL_NIF_TERM hmac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Key) */
-    struct digest_type_t *digp = NULL;
-    ErlNifBinary         key;
-    ERL_NIF_TERM         ret;
-    struct hmac_context  *obj;
-
-    digp = get_digest_type(argv[0]);
-    if (!digp ||
-        !enif_inspect_iolist_as_binary(env, argv[1], &key)) {
-        return enif_make_badarg(env);
-    }
-    if (!digp->md.p) {
-        return atom_notsup;
-    }
-
-    obj = enif_alloc_resource(hmac_context_rtype, sizeof(struct hmac_context));
-    obj->mtx = enif_mutex_create("crypto.hmac");
-    obj->alive = 1;
-    obj->ctx = HMAC_CTX_new();
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
-    // Check the return value of HMAC_Init: it may fail in FIPS mode
-    // for disabled algorithms
-    if (!HMAC_Init_ex(obj->ctx, key.data, key.size, digp->md.p, NULL)) {
-        enif_release_resource(obj);
-        return atom_notsup;
-    }
-#else
-    HMAC_Init_ex(obj->ctx, key.data, key.size, digp->md.p, NULL);
-#endif
-
-    ret = enif_make_resource(env, obj);
-    enif_release_resource(obj);
-    return ret;
-}
-
-static ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context, Data) */
-    ErlNifBinary data;
-    struct hmac_context* obj;
-
-    if (!enif_get_resource(env, argv[0], hmac_context_rtype, (void**)&obj)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
-	return enif_make_badarg(env);
-    }
-    enif_mutex_lock(obj->mtx);
-    if (!obj->alive) {
-	enif_mutex_unlock(obj->mtx);
-	return enif_make_badarg(env);
-    }
-    HMAC_Update(obj->ctx, data.data, data.size);
-    enif_mutex_unlock(obj->mtx);
-
-    CONSUME_REDS(env,data);
-    return argv[0];
-}
-
-static ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context) or (Context, HashLen) */
-    ERL_NIF_TERM ret;
-    struct hmac_context* obj;
-    unsigned char mac_buf[EVP_MAX_MD_SIZE];
-    unsigned char * mac_bin;
-    unsigned int req_len = 0;
-    unsigned int mac_len;
-
-    if (!enif_get_resource(env,argv[0],hmac_context_rtype, (void**)&obj)
-	|| (argc == 2 && !enif_get_uint(env, argv[1], &req_len))) {
-	return enif_make_badarg(env);
-    }
-
-    enif_mutex_lock(obj->mtx);
-    if (!obj->alive) {
-	enif_mutex_unlock(obj->mtx);
-	return enif_make_badarg(env);
-    }
-
-    HMAC_Final(obj->ctx, mac_buf, &mac_len);
-    HMAC_CTX_free(obj->ctx);
-    obj->alive = 0;
-    enif_mutex_unlock(obj->mtx);
-
-    if (argc == 2 && req_len < mac_len) {
-        /* Only truncate to req_len bytes if asked. */
-        mac_len = req_len;
-    }
-    mac_bin = enif_make_new_binary(env, mac_len, &ret);
-    memcpy(mac_bin, mac_buf, mac_len);
-
-    return ret;
-}
-
 static ERL_NIF_TERM cmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Type, Key, Data) */
 #if defined(HAVE_CMAC)
diff --git a/lib/crypto/c_src/hmac.c b/lib/crypto/c_src/hmac.c
new file mode 100644
index 0000000000..759544d5a7
--- /dev/null
+++ b/lib/crypto/c_src/hmac.c
@@ -0,0 +1,144 @@
+#include "hmac.h"
+#include "digest.h"
+
+ErlNifResourceType* hmac_context_rtype;
+
+ERL_NIF_TERM hmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type, Key, Data) or (Type, Key, Data, MacSize) */
+    struct digest_type_t *digp = NULL;
+    ErlNifBinary         key, data;
+    unsigned char        buff[EVP_MAX_MD_SIZE];
+    unsigned             size = 0, req_size = 0;
+    ERL_NIF_TERM         ret;
+
+    digp = get_digest_type(argv[0]);
+    if (!digp ||
+        !enif_inspect_iolist_as_binary(env, argv[1], &key) ||
+        !enif_inspect_iolist_as_binary(env, argv[2], &data) ||
+        (argc == 4 && !enif_get_uint(env, argv[3], &req_size))) {
+        return enif_make_badarg(env);
+    }
+
+    if (!digp->md.p ||
+        !HMAC(digp->md.p,
+              key.data, key.size,
+              data.data, data.size,
+              buff, &size)) {
+        return atom_notsup;
+    }
+    ASSERT(0 < size && size <= EVP_MAX_MD_SIZE);
+    CONSUME_REDS(env, data);
+
+    if (argc == 4) {
+        if (req_size <= size) {
+            size = req_size;
+        }
+        else {
+            return enif_make_badarg(env);
+        }
+    }
+    memcpy(enif_make_new_binary(env, size, &ret), buff, size);
+    return ret;
+}
+
+void hmac_context_dtor(ErlNifEnv* env, struct hmac_context *obj)
+{
+    if (obj->alive) {
+	HMAC_CTX_free(obj->ctx);
+	obj->alive = 0;
+    }
+    enif_mutex_destroy(obj->mtx);
+}
+
+ERL_NIF_TERM hmac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type, Key) */
+    struct digest_type_t *digp = NULL;
+    ErlNifBinary         key;
+    ERL_NIF_TERM         ret;
+    struct hmac_context  *obj;
+
+    digp = get_digest_type(argv[0]);
+    if (!digp ||
+        !enif_inspect_iolist_as_binary(env, argv[1], &key)) {
+        return enif_make_badarg(env);
+    }
+    if (!digp->md.p) {
+        return atom_notsup;
+    }
+
+    obj = enif_alloc_resource(hmac_context_rtype, sizeof(struct hmac_context));
+    obj->mtx = enif_mutex_create("crypto.hmac");
+    obj->alive = 1;
+    obj->ctx = HMAC_CTX_new();
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+    // Check the return value of HMAC_Init: it may fail in FIPS mode
+    // for disabled algorithms
+    if (!HMAC_Init_ex(obj->ctx, key.data, key.size, digp->md.p, NULL)) {
+        enif_release_resource(obj);
+        return atom_notsup;
+    }
+#else
+    HMAC_Init_ex(obj->ctx, key.data, key.size, digp->md.p, NULL);
+#endif
+
+    ret = enif_make_resource(env, obj);
+    enif_release_resource(obj);
+    return ret;
+}
+
+ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context, Data) */
+    ErlNifBinary data;
+    struct hmac_context* obj;
+
+    if (!enif_get_resource(env, argv[0], hmac_context_rtype, (void**)&obj)
+	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
+	return enif_make_badarg(env);
+    }
+    enif_mutex_lock(obj->mtx);
+    if (!obj->alive) {
+	enif_mutex_unlock(obj->mtx);
+	return enif_make_badarg(env);
+    }
+    HMAC_Update(obj->ctx, data.data, data.size);
+    enif_mutex_unlock(obj->mtx);
+
+    CONSUME_REDS(env,data);
+    return argv[0];
+}
+
+ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context) or (Context, HashLen) */
+    ERL_NIF_TERM ret;
+    struct hmac_context* obj;
+    unsigned char mac_buf[EVP_MAX_MD_SIZE];
+    unsigned char * mac_bin;
+    unsigned int req_len = 0;
+    unsigned int mac_len;
+
+    if (!enif_get_resource(env,argv[0],hmac_context_rtype, (void**)&obj)
+	|| (argc == 2 && !enif_get_uint(env, argv[1], &req_len))) {
+	return enif_make_badarg(env);
+    }
+
+    enif_mutex_lock(obj->mtx);
+    if (!obj->alive) {
+	enif_mutex_unlock(obj->mtx);
+	return enif_make_badarg(env);
+    }
+
+    HMAC_Final(obj->ctx, mac_buf, &mac_len);
+    HMAC_CTX_free(obj->ctx);
+    obj->alive = 0;
+    enif_mutex_unlock(obj->mtx);
+
+    if (argc == 2 && req_len < mac_len) {
+        /* Only truncate to req_len bytes if asked. */
+        mac_len = req_len;
+    }
+    mac_bin = enif_make_new_binary(env, mac_len, &ret);
+    memcpy(mac_bin, mac_buf, mac_len);
+
+    return ret;
+}
+
diff --git a/lib/crypto/c_src/hmac.h b/lib/crypto/c_src/hmac.h
new file mode 100644
index 0000000000..07f4558421
--- /dev/null
+++ b/lib/crypto/c_src/hmac.h
@@ -0,0 +1,21 @@
+#ifndef E_HMAC_H__
+#define E_HMAC_H__ 1
+
+#include "common.h"
+
+struct hmac_context
+{
+    ErlNifMutex* mtx;
+    int alive;
+    HMAC_CTX* ctx;
+};
+
+extern ErlNifResourceType* hmac_context_rtype;
+void hmac_context_dtor(ErlNifEnv* env, struct hmac_context*);
+
+ERL_NIF_TERM hmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM hmac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_HMAC_H__ */