From 81d604c70c68d450a0640823d0eaa722ca799e13 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 16 May 2013 11:45:19 -0700
Subject: [PATCH] Add crypto_generichash_keybytes() and
 crypto_generichash_bytes() to provide a default key/output size.

---
 .../crypto_generichash/crypto_generichash.c          | 12 ++++++++++++
 src/libsodium/include/sodium/crypto_generichash.h    |  8 ++++++++
 .../include/sodium/crypto_generichash_blake2b.h      |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/src/libsodium/crypto_generichash/crypto_generichash.c b/src/libsodium/crypto_generichash/crypto_generichash.c
index 66914ee4..e418a94a 100644
--- a/src/libsodium/crypto_generichash/crypto_generichash.c
+++ b/src/libsodium/crypto_generichash/crypto_generichash.c
@@ -1,6 +1,12 @@
 
 #include "crypto_generichash.h"
 
+size_t
+crypto_generichash_bytes(void)
+{
+    return crypto_generichash_BYTES;
+}
+
 size_t
 crypto_generichash_bytes_min(void)
 {
@@ -13,6 +19,12 @@ crypto_generichash_bytes_max(void)
     return crypto_generichash_BYTES_MAX;
 }
 
+size_t
+crypto_generichash_keybytes(void)
+{
+    return crypto_generichash_KEYBYTES;
+}
+
 size_t
 crypto_generichash_keybytes_min(void)
 {
diff --git a/src/libsodium/include/sodium/crypto_generichash.h b/src/libsodium/include/sodium/crypto_generichash.h
index 1b66ad95..52a16a8c 100644
--- a/src/libsodium/include/sodium/crypto_generichash.h
+++ b/src/libsodium/include/sodium/crypto_generichash.h
@@ -10,6 +10,10 @@
 extern "C" {
 #endif
 
+#define crypto_generichash_BYTES crypto_generichash_blake2b_BYTES
+SODIUM_EXPORT
+size_t  crypto_generichash_bytes(void);
+
 #define crypto_generichash_BYTES_MIN crypto_generichash_blake2b_BYTES_MIN
 SODIUM_EXPORT
 size_t  crypto_generichash_bytes_min(void);
@@ -18,6 +22,10 @@ size_t  crypto_generichash_bytes_min(void);
 SODIUM_EXPORT
 size_t  crypto_generichash_bytes_max(void);
 
+#define crypto_generichash_KEYBYTES crypto_generichash_blake2b_KEYBYTES
+SODIUM_EXPORT
+size_t  crypto_generichash_keybytes(void);
+
 #define crypto_generichash_KEYBYTES_MIN crypto_generichash_blake2b_KEYBYTES_MIN
 SODIUM_EXPORT
 size_t  crypto_generichash_keybytes_min(void);
diff --git a/src/libsodium/include/sodium/crypto_generichash_blake2b.h b/src/libsodium/include/sodium/crypto_generichash_blake2b.h
index 269c9b64..bf2e6698 100644
--- a/src/libsodium/include/sodium/crypto_generichash_blake2b.h
+++ b/src/libsodium/include/sodium/crypto_generichash_blake2b.h
@@ -6,8 +6,10 @@
 
 #include "export.h"
 
+#define crypto_generichash_blake2b_BYTES         32U
 #define crypto_generichash_blake2b_BYTES_MIN     16U
 #define crypto_generichash_blake2b_BYTES_MAX     64U
+#define crypto_generichash_blake2b_KEYBYTES      32U
 #define crypto_generichash_blake2b_KEYBYTES_MIN  16U
 #define crypto_generichash_blake2b_KEYBYTES_MAX  64U
 #define crypto_generichash_blake2b_BLOCKBYTES   128U