Make the key optional in crypto_generichash (blake2d) (#4)

* Make key optional for Blake2d bindings * Test * Rename original has to hash_key * Add missing export
Ianleeclark · Dec 3, 2021 · 49fa935 · 49fa935
1 parent 83543ec
commit 49fa935
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/lib/salty/generichash.ex b/lib/salty/generichash.ex
@@ -14,7 +14,7 @@ defmodule Salty.Generichash do
   @callback bytes_min() :: non_neg_integer()
 
   @callback bytes_max() :: non_neg_integer()
-  
+
   @callback bytes() :: non_neg_integer()
 
   @callback keybytes_min() :: non_neg_integer()
@@ -23,6 +23,8 @@ defmodule Salty.Generichash do
 
   @callback keybytes :: non_neg_integer()
 
+  @callback hash(binary(), binary()) :: {:ok, binary()} | {:error, atom()}
+
   @callback hash(binary(), binary(), binary()) :: {:ok, binary()} | {:error, atom()}
 
   @callback init(binary(), non_neg_integer()) :: {:ok, binary()} | {:error, atom()}

diff --git a/lib/salty/generichash_blake2b.ex b/lib/salty/generichash_blake2b.ex
@@ -33,8 +33,12 @@ defmodule Salty.Generichash.Blake2b do
     C.generichash_blake2b_PERSONALBYTES()
   end
 
+  def hash(outlen, data) do
+    C.generichash_blake2b(outlen, data)
+  end
+
   def hash(outlen, data, key) do
-    C.generichash_blake2b(outlen, data, key)
+    C.generichash_blake2b_key(outlen, data, key)
   end
 
   def hash(outlen, data, key, salt, personal) do

diff --git a/lib/salty/nif.ex b/lib/salty/nif.ex
@@ -126,7 +126,8 @@ defmodule Salty.Nif do
   def generichash_blake2b_KEYBYTES, do: :erlang.exit(:salty_nif_not_loaded)
   def generichash_blake2b_SALTBYTES, do: :erlang.exit(:salty_nif_not_loaded)
   def generichash_blake2b_PERSONALBYTES, do: :erlang.exit(:salty_nif_not_loaded)
-  def generichash_blake2b(_,_,_), do: :erlang.exit(:salty_nif_not_loaded)
+  def generichash_blake2b(_,_), do: :erlang.exit(:salty_nif_not_loaded)
+  def generichash_blake2b_key(_,_,_), do: :erlang.exit(:salty_nif_not_loaded)
   def generichash_blake2b_salt_personal(_,_,_,_,_), do: :erlang.exit(:salty_nif_not_loaded)
   def generichash_blake2b_init(_,_), do: :erlang.exit(:salty_nif_not_loaded)
   def generichash_blake2b_init_salt_personal(_,_,_,_), do: :erlang.exit(:salty_nif_not_loaded)

diff --git a/src/salty_nif.c b/src/salty_nif.c
@@ -1179,7 +1179,17 @@ SALTY_CONST_INT64(generichash_blake2b_KEYBYTES);
 SALTY_CONST_INT64(generichash_blake2b_SALTBYTES);
 SALTY_CONST_INT64(generichash_blake2b_PERSONALBYTES);
 
-SALTY_FUNC(generichash_blake2b, 3) DO
+SALTY_FUNC(generichash_blake2b, 2) DO
+    SALTY_INPUT_UINT64(0, outlen);
+    SALTY_INPUT_BIN(1, input, SALTY_BIN_NO_SIZE);
+
+    SALTY_OUTPUT_BIN(hash, outlen);
+
+    SALTY_CALL(crypto_generichash_blake2b(hash.data, outlen, input.data,
+                input.size, NULL, 0), hash);
+END_OK_WITH(hash);
+
+SALTY_FUNC(generichash_blake2b_key, 3) DO
     SALTY_INPUT_UINT64(0, outlen);
     SALTY_INPUT_BIN(1, input, SALTY_BIN_NO_SIZE);
     SALTY_INPUT_BIN(2, key, crypto_generichash_blake2b_KEYBYTES_MIN);
@@ -2114,7 +2124,8 @@ salty_exports[] = {
     SALTY_EXPORT_CONS(generichash_blake2b_KEYBYTES, 0),
     SALTY_EXPORT_CONS(generichash_blake2b_SALTBYTES, 0),
     SALTY_EXPORT_CONS(generichash_blake2b_PERSONALBYTES, 0),
-    SALTY_EXPORT_FUNC(generichash_blake2b, 3),
+    SALTY_EXPORT_FUNC(generichash_blake2b, 2),
+    SALTY_EXPORT_FUNC(generichash_blake2b_key, 3),
     SALTY_EXPORT_FUNC(generichash_blake2b_salt_personal, 5),
     SALTY_EXPORT_FUNC(generichash_blake2b_init, 2),
     SALTY_EXPORT_FUNC(generichash_blake2b_init_salt_personal, 4),