From 921507cc59854b93c3394cfe5c2bb22ccd035771 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 22 Jan 2016 16:03:09 +0100
Subject: [PATCH] Add extra sodium_memzero() in Argon2

---
 src/libsodium/crypto_pwhash/argon2/argon2.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libsodium/crypto_pwhash/argon2/argon2.c b/src/libsodium/crypto_pwhash/argon2/argon2.c
index 92e74bd6..ea7fed9e 100644
--- a/src/libsodium/crypto_pwhash/argon2/argon2.c
+++ b/src/libsodium/crypto_pwhash/argon2/argon2.c
@@ -127,7 +127,7 @@ int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
     result = argon2_core(&context, type);
 
     if (result != ARGON2_OK) {
-        memset(out, 0x00, hashlen);
+        sodium_memzero(out, hashlen);
         free(out);
         return result;
     }
@@ -140,13 +140,14 @@ int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
     /* if encoding requested, write it */
     if (encoded && encodedlen) {
         if (!encode_string(encoded, encodedlen, &context, type)) {
-            memset(out, 0x00, hashlen);
-            memset(encoded, 0x00, encodedlen);
+            sodium_memzero(out, hashlen);
+            sodium_memzero(encoded, encodedlen);
             free(out);
             return ARGON2_ENCODING_FAIL;
         }
     }
 
+    sodium_memzero(out, hashlen);
     free(out);
 
     return ARGON2_OK;