Improve Elixir/Mix/Hex.pm compatibility

Makefile

@@ -1,10 +1,8 @@
 all:
-	./rebar -v get-deps
-	./rebar -v compile
+	./rebar3 compile
 
 clean:
-	./rebar -v delete-deps
-	./rebar -v clean
+	./rebar3 clean --all
 
 eunit:
-	./rebar -v eunit
+	./rebar3 eunit

README.md

@@ -1,6 +1,6 @@
-### sha3
+### keccak
 
-sha3 is a NIF wrapper around SHA-3/KECCAK cryptographic hashing function
+keccak is a NIF wrapper around SHA-3/KECCAK cryptographic hashing function
 
 ### Quick Start
 
@@ -59,4 +59,3 @@ Alternatively, you might want to incrementally hash a longer message:
 The underlying hashing code in sha3 is the reference implementation of KECCAK, now SHA-3, from the official NIST submission.
 
 Details on the algorithm as submitted and known analysis can be found at http://keccak.noekeon.org/.
-

c_src/Makefile

@@ -0,0 +1,75 @@
+# Based on c_src.mk from erlang.mk by Loic Hoguin <essen@ninenines.eu>
+
+CURDIR := $(shell pwd)
+BASEDIR := $(abspath $(CURDIR)/..)
+
+PROJECT ?= $(notdir $(BASEDIR))
+PROJECT := $(strip $(PROJECT))
+
+ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]).")
+ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, include)]).")
+ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, lib)]).")
+
+C_SRC_DIR = $(CURDIR)
+C_SRC_OUTPUT ?= $(CURDIR)/../priv/$(PROJECT).so
+
+# System type and C compiler/flags.
+
+UNAME_SYS := $(shell uname -s)
+ifeq ($(UNAME_SYS), Darwin)
+	CC ?= cc
+	CFLAGS ?= -O3 -std=c99 -arch x86_64 -finline-functions -Wall -Wmissing-prototypes
+	CXXFLAGS ?= -O3 -arch x86_64 -finline-functions -Wall
+	LDFLAGS ?= -arch x86_64 -flat_namespace -undefined suppress -lstdc++
+else ifeq ($(UNAME_SYS), FreeBSD)
+	CC ?= cc
+	CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
+	CXXFLAGS ?= -O3 -finline-functions -Wall -lstdc++
+else ifeq ($(UNAME_SYS), Linux)
+	CC ?= gcc
+	CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
+	CXXFLAGS ?= -O3 -finline-functions -Wall
+	LDFLAGS ?= -lstdc++
+endif
+
+CFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
+CXXFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
+
+LDLIBS += -L $(ERL_INTERFACE_LIB_DIR) -lerl_interface -lei
+LDFLAGS += -shared
+
+# Verbosity.
+
+c_verbose_0 = @echo " C     " $(?F);
+c_verbose = $(c_verbose_$(V))
+
+cpp_verbose_0 = @echo " CPP   " $(?F);
+cpp_verbose = $(cpp_verbose_$(V))
+
+link_verbose_0 = @echo " LD    " $(@F);
+link_verbose = $(link_verbose_$(V))
+
+SOURCES := $(shell find $(C_SRC_DIR) -type f \( -name "*.c" -o -name "*.C" -o -name "*.cc" -o -name "*.cpp" \))
+OBJECTS = $(addsuffix .o, $(basename $(SOURCES)))
+
+COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) -c
+COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+
+$(C_SRC_OUTPUT): $(OBJECTS)
+	@mkdir -p $(BASEDIR)/priv/
+	$(link_verbose) $(CC) $(OBJECTS) $(LDFLAGS) $(LDLIBS) -o $(C_SRC_OUTPUT)
+
+%.o: %.c
+	$(COMPILE_C) $(OUTPUT_OPTION) $<
+
+%.o: %.cc
+	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
+
+%.o: %.C
+	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
+
+%.o: %.cpp
+	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
+
+clean:
+	@rm -f $(C_SRC_OUTPUT) $(OBJECTS)

c_src/sha3_nifs.c → c_src/keccak_nifs.c

@@ -28,7 +28,7 @@ static ErlNifFunc nif_funcs[] =
     {"hash", 3, keccak_hash}
 };
 
-ERL_NIF_INIT(sha3, nif_funcs, load, NULL, NULL, NULL);
+ERL_NIF_INIT(keccak, nif_funcs, load, NULL, NULL, NULL);
 
 static char *hash_return_strings[] = {"success", "fail", "bad_hashlen"};
 
@@ -71,12 +71,12 @@ void unload(ErlNifEnv* env, void* priv)
 }
 
 ERL_NIF_TERM keccak_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{   
+{
   ERL_NIF_TERM hash_state_term;
     int bits = 0;
     if(!enif_get_int(env, argv[0], &bits))
         return enif_make_badarg(env);
-    
+
     hashState *state = (hashState*) enif_alloc_resource_compat(env, keccak_hashstate, sizeof(hashState));
     HashReturn r = Init(state, bits);
     if (r == SUCCESS) {
@@ -96,7 +96,7 @@ ERL_NIF_TERM keccak_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 
     ErlNifBinary bin;
     enif_inspect_binary(env, argv[1], &bin);
-    
+
     int bitlength = 0;
     if(!enif_get_int(env, argv[2], &bitlength))
         return enif_make_badarg(env);
@@ -119,7 +119,7 @@ ERL_NIF_TERM keccak_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     hashState *state = NULL;
     enif_get_resource(env, argv[0], keccak_hashstate, (void**)&state);
-    
+
     ErlNifBinary out;
     enif_alloc_binary_compat(env, (size_t)(state->fixedOutputLength/8), &out);
 
@@ -135,11 +135,11 @@ ERL_NIF_TERM keccak_hash(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     int bits = 0;
     enif_get_int(env, argv[0], &bits);
-    
+
     ErlNifBinary bin, out;
     enif_inspect_binary(env, argv[1], &bin);
     enif_alloc_binary_compat(env, (size_t)(bits/8), &out);
-    
+
     int bitlength = 0;
     if(!enif_get_int(env, argv[2], &bitlength))
         return enif_make_badarg(env);
@@ -154,5 +154,5 @@ ERL_NIF_TERM keccak_hash(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
         return enif_make_tuple2(env, enif_make_atom(env, "ok"), enif_make_binary(env, &out));
     } else {
         return enif_make_tuple2(env, enif_make_atom(env, "error"), enif_make_atom(env, hash_return_strings[r]));
-    }   
+    }
 }