From: Frank Denis <github@pureftpd.org>
Date: Sun, 1 Oct 2017 14:00:41 +0000 (+0200)
Subject: ext/sodium: fix pwhash_argon2i test
X-Git-Tag: php-7.2.0RC4~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0663ca135d6f0572437f1fc4fb4d6e6120cac2bd;p=php

ext/sodium: fix pwhash_argon2i test
---

diff --git a/ext/sodium/tests/pwhash_argon2i.phpt b/ext/sodium/tests/pwhash_argon2i.phpt
index 2161268094..5f3c88aaef 100644
--- a/ext/sodium/tests/pwhash_argon2i.phpt
+++ b/ext/sodium/tests/pwhash_argon2i.phpt
@@ -10,14 +10,14 @@ $passwd = 'password';
 $hash = sodium_crypto_pwhash_str
   ($passwd, SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
 			SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE);
-var_dump(substr($hash, 0, 9) ===
+var_dump(substr($hash, 0, strlen(SODIUM_CRYPTO_PWHASH_STRPREFIX)) ===
 		 SODIUM_CRYPTO_PWHASH_STRPREFIX);
 
 $testHash = '$argon2i$v=19$m=4096,t=3,p=1$MzE4ODFiZWFlMjAzOWUAAA$FWUV6tsyJ32qThiLi1cCsLIbf3dIOG/RwXcTzt536KY';
 $c = sodium_crypto_pwhash_str_verify($testHash, $passwd);
 var_dump($c);
 
-$testHash = '$argon2i$v=19$m=4096,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$JTBozgKQiCn5yKAm3Hz0vUSX/XgfqhZloNCxDWmeDr0';
+$testHash = '$argon2i$v=19$m=4096,t=0,p=1$c29tZXNhbHQAAAAAAAAAAA$JTBozgKQiCn5yKAm3Hz0vUSX/XgfqhZloNCxDWmeDr0';
 $c = sodium_crypto_pwhash_str_verify($testHash, $passwd);
 var_dump($c);