From ebcc2a66366dc2f990f37e4114cf52ab4cedcba1 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 15 Feb 2023 19:47:35 +0100
Subject: [PATCH] pwhash: fill output buffer with junk prior to running the
 actual KDF

These functions are a little bit special, because unlike everything
else, they do dynamic memory allocations, and are more likely to fail.

Applications are expected to check the return code, and these functions
are tagged with ((warn_unused_result)) but applications may still
ignore these.

This is also an issue with JavaScript, when total memory hasn't been
properly configured.

To be safe, fill the buffer with non-deterministic bytes, that are
unlikely to ever verify later.
---
 src/libsodium/crypto_pwhash/argon2/argon2.c                  | 5 +++++
 .../scryptsalsa208sha256/crypto_scrypt-common.c              | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/libsodium/crypto_pwhash/argon2/argon2.c b/src/libsodium/crypto_pwhash/argon2/argon2.c
index c6277fc8..5912f7fc 100644
--- a/src/libsodium/crypto_pwhash/argon2/argon2.c
+++ b/src/libsodium/crypto_pwhash/argon2/argon2.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "randombytes.h"
 #include "utils.h"
 
 #include "argon2-core.h"
@@ -93,6 +94,10 @@ argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
     int            result;
     uint8_t       *out;
 
+    if (hash != NULL) {
+        randombytes_buf(hash, hashlen);
+    }
+
     if (pwdlen > ARGON2_MAX_PWD_LENGTH) {
         return ARGON2_PWD_TOO_LONG;
     }
diff --git a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
index c4dd46a2..65aebb11 100644
--- a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
+++ b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
@@ -24,6 +24,7 @@
 #include "crypto_pwhash_scryptsalsa208sha256.h"
 #include "crypto_scrypt.h"
 #include "private/common.h"
+#include "randombytes.h"
 #include "runtime.h"
 #include "utils.h"
 
@@ -150,6 +151,10 @@ escrypt_r(escrypt_local_t *local, const uint8_t *passwd, size_t passwdlen,
     uint32_t       r;
     uint32_t       p;
 
+    if (buf != NULL) {
+        randombytes_buf(buf, buflen);
+    }
+
     src = escrypt_parse_setting(setting, &N_log2, &r, &p);
     if (!src) {
         return NULL;