Move blake2 own functions to the crypto_generichash_blake2b namespace

src/libsodium/Makefile.am

@@ -29,7 +29,6 @@ libsodium_la_SOURCES = \
 	crypto_generichash/blake2/ref/blake2-impl.h \
 	crypto_generichash/blake2/ref/blake2.h \
 	crypto_generichash/blake2/ref/blake2b-ref.c \
-	crypto_generichash/blake2/ref/blake2s-ref.c \
 	crypto_generichash/blake2/ref/generichash_blake2b.c \
 	crypto_hash/crypto_hash.c \
 	crypto_hash/sha256/ref/api.h \

src/libsodium/crypto_generichash/blake2/ref/blake2-impl.h

@@ -10,7 +10,7 @@
    You should have received a copy of the CC0 Public Domain Dedication along with
    this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 */
-#pragma once
+
 #ifndef __BLAKE2_IMPL_H__
 #define __BLAKE2_IMPL_H__
 

src/libsodium/crypto_generichash/blake2/ref/blake2.h

@@ -10,7 +10,7 @@
    You should have received a copy of the CC0 Public Domain Dedication along with
    this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 */
-#pragma once
+
 #ifndef __BLAKE2_H__
 #define __BLAKE2_H__
 
@@ -19,6 +19,13 @@
 
 #include "crypto_generichash_blake2b.h"
 
+#define blake2b_init_param crypto_generichash_blake2b__init_param
+#define blake2b_init       crypto_generichash_blake2b__init
+#define blake2b_init_key   crypto_generichash_blake2b__init_key
+#define blake2b_update     crypto_generichash_blake2b__update
+#define blake2b_final      crypto_generichash_blake2b__final
+#define blake2b            crypto_generichash_blake2b__blake2b
+
 #if defined(_MSC_VER)
 #define ALIGN(x) __declspec(align(x))
 #else