From 0426aa28da62646491bd79a86e2052fbd827695f Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 20 Apr 2013 00:29:17 +0200
Subject: [PATCH] Welcome, Blake2

---
 .../crypto_generichash/blake2/ref/generichash_blake2b.c        | 3 +--
 src/libsodium/include/sodium.h                                 | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libsodium/crypto_generichash/blake2/ref/generichash_blake2b.c b/src/libsodium/crypto_generichash/blake2/ref/generichash_blake2b.c
index eb81039d..897dbb50 100644
--- a/src/libsodium/crypto_generichash/blake2/ref/generichash_blake2b.c
+++ b/src/libsodium/crypto_generichash/blake2/ref/generichash_blake2b.c
@@ -13,8 +13,7 @@ crypto_generichash_blake2b(unsigned char *out, const unsigned char *in,
                            size_t keylen)
 {
     if (outlen <= 0U || outlen > BLAKE2B_OUTBYTES ||
-        keylen > BLAKE2B_KEYBYTES ||
-        inlen > UINT64_MAX) {
+        keylen > BLAKE2B_KEYBYTES || inlen > UINT64_MAX) {
         return -1;
     }
     assert(outlen <= UINT8_MAX);
diff --git a/src/libsodium/include/sodium.h b/src/libsodium/include/sodium.h
index c71023dd..e1722bea 100644
--- a/src/libsodium/include/sodium.h
+++ b/src/libsodium/include/sodium.h
@@ -12,6 +12,8 @@
 #include <sodium/crypto_core_salsa20.h>
 #include <sodium/crypto_core_salsa2012.h>
 #include <sodium/crypto_core_salsa208.h>
+#include <sodium/crypto_generichash.h>
+#include <sodium/crypto_generichash_blake2b.h>
 #include <sodium/crypto_hash.h>
 #include <sodium/crypto_hash_sha256.h>
 #include <sodium/crypto_hash_sha512.h>