From: Frank Denis <github@pureftpd.org>
Date: Tue, 8 Aug 2017 15:37:06 +0000 (+0200)
Subject: sodium ext: The default password hashing function is not supposed to be Argon2i
X-Git-Tag: php-7.2.0beta3~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0d1e0915c82e4ae867efe9cf3d9b65a5522faef;p=php

sodium ext: The default password hashing function is not supposed to be Argon2i
---

diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
index 48b2a9ca3b..2f311e059c 100644
--- a/ext/sodium/libsodium.c
+++ b/ext/sodium/libsodium.c
@@ -1823,10 +1823,10 @@ PHP_FUNCTION(sodium_crypto_pwhash)
 	}
 	if (opslimit < crypto_pwhash_OPSLIMIT_INTERACTIVE) {
 		zend_error(E_WARNING,
-				   "number of operations for the argon2i function is low");
+				   "number of operations for the password hashing function is low");
 	}
 	if (memlimit < crypto_pwhash_MEMLIMIT_INTERACTIVE) {
-		zend_error(E_WARNING, "maximum memory for the argon2i function is low");
+		zend_error(E_WARNING, "maximum memory for the password hashing function is low");
 	}
 	hash = zend_string_alloc((size_t) hash_len, 0);
 	if (crypto_pwhash
@@ -1866,11 +1866,11 @@ PHP_FUNCTION(sodium_crypto_pwhash_str)
 	}
 	if (opslimit < crypto_pwhash_OPSLIMIT_INTERACTIVE) {
 		zend_error(E_WARNING,
-				   "number of operations for the argon2i function is low");
+				   "number of operations for the password hashing function is low");
 	}
 	if (memlimit < crypto_pwhash_MEMLIMIT_INTERACTIVE) {
 		zend_error(E_WARNING,
-				   "maximum memory for the argon2i function is low");
+				   "maximum memory for the password hashing function is low");
 	}
 	hash_str = zend_string_alloc(crypto_pwhash_STRBYTES - 1, 0);
 	if (crypto_pwhash_str