move blake2 out of subdirectory

[zpackage] / lib / blake2.h

diff --git a/lib/blake2/ref/blake2.h b/lib/blake2.h
similarity index 89%
rename from lib/blake2/ref/blake2.h
rename to lib/blake2.h
index ad62f260e7397d9404a62e3aaa24053fa2ceacb5..109bf1a3c4d50ffc14fb39711760175cbb6a1e51 100644 (file)
--- a/lib/blake2/ref/blake2.h
+++ b/lib/blake2.h
@@ -1,17 +1,3 @@
-/*
-   BLAKE2 reference source code package - reference C implementations
-
-   Copyright 2012, Samuel Neves <sneves@dei.uc.pt>.  You may use this under the
-   terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at
-   your option.  The terms of these licenses can be found at:
-
-   - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
-   - OpenSSL license   : https://www.openssl.org/source/license.html
-   - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
-
-   More information about the BLAKE2 hash function can be found at
-   https://blake2.net.
-*/
 #ifndef BLAKE2_H
 #define BLAKE2_H
 
@@ -22,10 +8,6 @@
 #define BLAKE2_PACKED(x) __pragma(pack(push, 1)) x __pragma(pack(pop))
 #else
 #define BLAKE2_PACKED(x) x __attribute__((packed))
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
 #endif
 
   enum blake2s_constant
@@ -188,8 +170,4 @@ extern "C" {
   /* This is simply an alias for blake2b */
   int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
 
-#if defined(__cplusplus)
-}
-#endif
-
 #endif