From f46439c1e277263f0b9de6af4f8737855256adff Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 6 Jun 2015 12:46:22 +0200
Subject: [PATCH] Ensure that PBKDF2_SHA256() is not used to output more than
 128 Go.

---
 .../crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c
index 9b585a27..85bb48bd 100644
--- a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c
+++ b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c
@@ -53,6 +53,9 @@ PBKDF2_SHA256(const uint8_t * passwd, size_t passwdlen, const uint8_t * salt,
     int             k;
     size_t          clen;
 
+    if (dkLen > 0x1fffffffe0UL) {
+        abort();
+    }
     crypto_auth_hmacsha256_init(&PShctx, passwd, passwdlen);
     crypto_auth_hmacsha256_update(&PShctx, salt, saltlen);