add un-optimized generic blake3 implementation..

haven't figured out how to add the SSE2/SSE4.1/AVX2/AVX512/Arm+Neon optimized versions when applicable.. and other issues too, like PHP_BLAKE3_SPEC

going to ask for help upstream

Author: divinity76

ext/hash/blake3/blake3_dispatch.c

@@ -14,6 +14,8 @@
 #endif
 #endif
 
+#define MAYBE_UNUSED(x) (void)((x))
+
 #if defined(IS_X86)
 static uint64_t xgetbv() {
 #if defined(_MSC_VER)
@@ -137,6 +139,7 @@ void blake3_compress_in_place(uint32_t cv[8],
                               uint8_t flags) {
 #if defined(IS_X86)
   const enum cpu_feature features = get_cpu_features();
+  MAYBE_UNUSED(features);
 #if !defined(BLAKE3_NO_AVX512)
   if (features & AVX512VL) {
     blake3_compress_in_place_avx512(cv, block, block_len, counter, flags);
@@ -165,6 +168,7 @@ void blake3_compress_xof(const uint32_t cv[8],
                          uint8_t out[64]) {
 #if defined(IS_X86)
   const enum cpu_feature features = get_cpu_features();
+  MAYBE_UNUSED(features);
 #if !defined(BLAKE3_NO_AVX512)
   if (features & AVX512VL) {
     blake3_compress_xof_avx512(cv, block, block_len, counter, flags, out);
@@ -193,6 +197,7 @@ void blake3_hash_many(const uint8_t *const *inputs, size_t num_inputs,
                       uint8_t flags_start, uint8_t flags_end, uint8_t *out) {
 #if defined(IS_X86)
   const enum cpu_feature features = get_cpu_features();
+  MAYBE_UNUSED(features);
 #if !defined(BLAKE3_NO_AVX512)
   if ((features & (AVX512F|AVX512VL)) == (AVX512F|AVX512VL)) {
     blake3_hash_many_avx512(inputs, num_inputs, blocks, key, counter,
@@ -242,6 +247,7 @@ void blake3_hash_many(const uint8_t *const *inputs, size_t num_inputs,
 size_t blake3_simd_degree(void) {
 #if defined(IS_X86)
   const enum cpu_feature features = get_cpu_features();
+  MAYBE_UNUSED(features);
 #if !defined(BLAKE3_NO_AVX512)
   if ((features & (AVX512F|AVX512VL)) == (AVX512F|AVX512VL)) {
     return 16;
@@ -268,3 +274,4 @@ size_t blake3_simd_degree(void) {
 #endif
   return 1;
 }
+

ext/hash/config.m4

@@ -11,7 +11,9 @@ if test "$PHP_MHASH" != "no"; then
   AC_DEFINE(PHP_MHASH_BC, 1, [ ])
 fi
 
+
 if test $ac_cv_c_bigendian_php = yes; then
+  dnl todo: check if blake3/blake3_neon.c is applicable
   EXT_HASH_SHA3_SOURCES="hash_sha3.c"
   AC_DEFINE(HAVE_SLOW_HASH3, 1, [Define is hash3 algo is available])
   AC_MSG_WARN("Use SHA3 slow implementation on bigendian")
@@ -33,13 +35,23 @@ else
   PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1)
 fi
 
+EXT_HASH_BLAKE3_SOURCES="hash_blake3.c blake3/blake3.c blake3/blake3_dispatch.c blake3/blake3_portable.c"
+dnl todo: add optimized versions of blake3 for sse2/sse4.1/avx2/avx512/arm+neon 
+dnl ...when applicable...
+dnl EXT_HASH_BLAKE3_SOURCES="$EXT_HASH_BLAKE3_SOURCES blake3/blake3_sse2.c blake3/blake3_sse41.c blake3/blake3_avx2.c blake3/blake3_avx512.c"
+
+PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -DBLAKE3_NO_SSE2 -DBLAKE3_NO_SSE41 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_AVX512"
+
+
+
 EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \
   hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \
-  hash_crc32.c hash_fnv.c hash_joaat.c $EXT_HASH_SHA3_SOURCES"
+  hash_crc32.c hash_fnv.c hash_joaat.c $EXT_HASH_SHA3_SOURCES \
+  $EXT_HASH_BLAKE3_SOURCES"
 EXT_HASH_HEADERS="php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h \
   php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \
   php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h \
-  php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h"
+  php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h php_hash_blake3.h"
 
 PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, 0,,$PHP_HASH_CFLAGS)
 PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS)

ext/hash/hash.c

@@ -1586,6 +1586,7 @@ PHP_MINIT_FUNCTION(hash)
 	php_hash_register_algo("fnv164",		&php_hash_fnv164_ops);
 	php_hash_register_algo("fnv1a64",		&php_hash_fnv1a64_ops);
 	php_hash_register_algo("joaat",			&php_hash_joaat_ops);
+	php_hash_register_algo("blake3",		&php_hash_blake3_ops);
 
 	PHP_HASH_HAVAL_REGISTER(3,128);
 	PHP_HASH_HAVAL_REGISTER(3,160);

ext/hash/hash_blake3.c

@@ -0,0 +1,25 @@
+#include "php_hash.h"
+#include "php_hash_blake3.h"
+#include "blake3/blake3.h"
+#include <string.h> // memcpy
+
+PHP_HASH_API void PHP_BLAKE3Init(PHP_BLAKE3_CTX *context)
+{
+	blake3_hasher_init(context);
+}
+
+PHP_HASH_API void PHP_BLAKE3Update(PHP_BLAKE3_CTX *context, const unsigned char *input, size_t len)
+{
+	blake3_hasher_update(context, input, len);
+}
+
+PHP_HASH_API void PHP_BLAKE3Final(unsigned char digest[BLAKE3_OUT_LEN/*32*/], PHP_BLAKE3_CTX *context)
+{
+	blake3_hasher_finalize(context, digest, BLAKE3_OUT_LEN);
+}
+
+PHP_HASH_API int PHP_BLAKE3Copy(const php_hash_ops *ops, PHP_BLAKE3_CTX *orig_context, PHP_BLAKE3_CTX *copy_context)
+{
+	memcpy(copy_context, orig_context, sizeof(*orig_context));
+	return SUCCESS;
+}

ext/hash/php_hash.h

@@ -105,6 +105,7 @@ extern const php_hash_ops php_hash_fnv1a32_ops;
 extern const php_hash_ops php_hash_fnv164_ops;
 extern const php_hash_ops php_hash_fnv1a64_ops;
 extern const php_hash_ops php_hash_joaat_ops;
+extern const php_hash_ops php_hash_blake3_ops;
 
 #define PHP_HASH_HAVAL_OPS(p,b)	extern const php_hash_ops php_hash_##p##haval##b##_ops;
 

ext/hash/php_hash_blake3.h

@@ -0,0 +1,35 @@
+#ifndef PHP_HASH_BLAKE3_H
+#define PHP_HASH_BLAKE3_H
+
+#include "ext/standard/basic_functions.h"
+#include "php_hash.h"
+#include "blake3/blake3.h"
+
+
+// typedef struct blake3_hasher PHP_BLAKE3_CTX;
+#define PHP_BLAKE3_CTX blake3_hasher
+// help: what is V supposed to be?
+#define PHP_BLAKE3_SPEC "l.I_HAVE_NO_IDEA_WHAT_THIS_IS_SUPPOSED_TO_BE"
+
+PHP_HASH_API void PHP_BLAKE3Init(PHP_BLAKE3_CTX *context);
+PHP_HASH_API void PHP_BLAKE3Update(PHP_BLAKE3_CTX *context, const unsigned char *input, size_t len);
+PHP_HASH_API void PHP_BLAKE3Final(unsigned char digest[BLAKE3_OUT_LEN/*32*/], PHP_BLAKE3_CTX *context);
+PHP_HASH_API int PHP_BLAKE3Copy(const php_hash_ops *ops, PHP_BLAKE3_CTX *orig_context, PHP_BLAKE3_CTX *copy_context);
+
+const php_hash_ops php_hash_blake3_ops = {
+	"blake3",
+	(php_hash_init_func_t) PHP_BLAKE3Init,
+	(php_hash_update_func_t) PHP_BLAKE3Update,
+	(php_hash_final_func_t) PHP_BLAKE3Final,
+	(php_hash_copy_func_t) PHP_BLAKE3Copy,
+	php_hash_serialize,
+	php_hash_unserialize,
+	PHP_BLAKE3_SPEC, // << don't know what this should be, hopefully a dev that knows can remove this comment
+	BLAKE3_OUT_LEN /*32*/,
+	BLAKE3_CHUNK_LEN /*1024*/,
+	sizeof(*((PHP_BLAKE3_CTX*)NULL)), // << bet there's a better way to write that
+	1
+};
+
+#endif
+