vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2.h in rbnacl-libsodium-0.4.5 vs vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2.h in rbnacl-libsodium-0.5.0

@@ -17,16 +17,19 @@
 #include <stddef.h>
 #include <stdint.h>
 
 #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
+#define blake2b_init_param             crypto_generichash_blake2b__init_param
+#define blake2b_init                   crypto_generichash_blake2b__init
+#define blake2b_init_salt_personal     crypto_generichash_blake2b__init_salt_personal
+#define blake2b_init_key               crypto_generichash_blake2b__init_key
+#define blake2b_init_key_salt_personal crypto_generichash_blake2b__init_key_salt_personal
+#define blake2b_update                 crypto_generichash_blake2b__update
+#define blake2b_final                  crypto_generichash_blake2b__final
+#define blake2b                        crypto_generichash_blake2b__blake2b
+#define blake2b_salt_personal          crypto_generichash_blake2b__blake2b_salt_personal
 
 #if defined(_MSC_VER)
 #define ALIGN(x) __declspec(align(x))
 #else
 #define ALIGN(x) __attribute__((aligned(x)))
@@ -132,11 +135,15 @@
   int blake2s_init_param( blake2s_state *S, const blake2s_param *P );
   int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen );
   int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen );
 
   int blake2b_init( blake2b_state *S, const uint8_t outlen );
+  int blake2b_init_salt_personal( blake2b_state *S, const uint8_t outlen,
+                                  const void *personal, const void *salt );
   int blake2b_init_key( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
+  int blake2b_init_key_salt_personal( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen,
+                                      const void *salt, const void *personal );
   int blake2b_init_param( blake2b_state *S, const blake2b_param *P );
   int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen );
   int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen );
 
   int blake2sp_init( blake2sp_state *S, const uint8_t outlen );
@@ -150,9 +157,10 @@
   int blake2bp_final( blake2bp_state *S, uint8_t *out, uint8_t outlen );
 
   // Simple API
   int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
   int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
+  int blake2b_salt_personal( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen, const void *salt, const void *personal );
 
   int blake2sp( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
   int blake2bp( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
 
   static inline int blake2( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen )