2017-06-06 14:40:19 +00:00
|
|
|
--TEST--
|
2017-07-30 13:05:21 +00:00
|
|
|
Check for libsodium argon2i
|
run-tests: use the EXTENSIONS section for skipping
Currently, most skip checks are just for making sure an extension is
available. Even with recent addition of skip caching, this makes tests
needlessly slow:
* Checks for the same extension in its tests can have small differences
impacting cacheability.
* Even identical skip checks in two tests can still be executed twice if
they're run by different workers.
To remedy this, I'm repurposing the existing --EXTENSIONS-- section of
.phpt files to specify wjich extensions are required for current test to
run. Current behavior:
1) If the extension is already visible to PHP, all is good
2) If it isn't, assume it's present as a shared module and attempt to add
it via a command line parameter
3) If that works, all is good
4) If it doesn't, PHP fails with a cryptic error message trying to
execute the test itself
After this commit:
1) and 2) are kept unchanged
3) Check if shared extension file from 2) is actually present
4) Skip the test if it isn't
Other benefits include clear skip reasons (vs. sometimes none in many
current skip checks) and moving test information from code to metadata,
opening more opportunities for search and analysis.
Since --EXTENSIONS-- is barely ever used, this change poses no risk of
hidden failures.
As a demonstration of the new approach, this commit migrates one
extension to it. If merged, I will migrate other extensions in
subsequent PRs.
Closes GH-6787.
2021-03-18 11:53:14 +00:00
|
|
|
--EXTENSIONS--
|
|
|
|
|
sodium
|
2017-06-06 14:40:19 +00:00
|
|
|
--SKIPIF--
|
run-tests: use the EXTENSIONS section for skipping
Currently, most skip checks are just for making sure an extension is
available. Even with recent addition of skip caching, this makes tests
needlessly slow:
* Checks for the same extension in its tests can have small differences
impacting cacheability.
* Even identical skip checks in two tests can still be executed twice if
they're run by different workers.
To remedy this, I'm repurposing the existing --EXTENSIONS-- section of
.phpt files to specify wjich extensions are required for current test to
run. Current behavior:
1) If the extension is already visible to PHP, all is good
2) If it isn't, assume it's present as a shared module and attempt to add
it via a command line parameter
3) If that works, all is good
4) If it doesn't, PHP fails with a cryptic error message trying to
execute the test itself
After this commit:
1) and 2) are kept unchanged
3) Check if shared extension file from 2) is actually present
4) Skip the test if it isn't
Other benefits include clear skip reasons (vs. sometimes none in many
current skip checks) and moving test information from code to metadata,
opening more opportunities for search and analysis.
Since --EXTENSIONS-- is barely ever used, this change poses no risk of
hidden failures.
As a demonstration of the new approach, this commit migrates one
extension to it. If merged, I will migrate other extensions in
subsequent PRs.
Closes GH-6787.
2021-03-18 11:53:14 +00:00
|
|
|
<?php
|
2017-06-06 14:40:19 +00:00
|
|
|
if (!defined('SODIUM_CRYPTO_PWHASH_SALTBYTES')) print "skip libsodium without argon2i"; ?>
|
|
|
|
|
--FILE--
|
|
|
|
|
<?php
|
|
|
|
|
$passwd = 'password';
|
|
|
|
|
|
|
|
|
|
$hash = sodium_crypto_pwhash_str
|
|
|
|
|
($passwd, SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
|
2017-10-02 20:28:46 +00:00
|
|
|
SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE);
|
2017-10-01 14:00:41 +00:00
|
|
|
var_dump(substr($hash, 0, strlen(SODIUM_CRYPTO_PWHASH_STRPREFIX)) ===
|
2017-10-02 20:28:46 +00:00
|
|
|
SODIUM_CRYPTO_PWHASH_STRPREFIX);
|
2017-06-06 14:40:19 +00:00
|
|
|
|
|
|
|
|
$testHash = '$argon2i$v=19$m=4096,t=3,p=1$MzE4ODFiZWFlMjAzOWUAAA$FWUV6tsyJ32qThiLi1cCsLIbf3dIOG/RwXcTzt536KY';
|
|
|
|
|
$c = sodium_crypto_pwhash_str_verify($testHash, $passwd);
|
|
|
|
|
var_dump($c);
|
|
|
|
|
|
2017-10-01 14:00:41 +00:00
|
|
|
$testHash = '$argon2i$v=19$m=4096,t=0,p=1$c29tZXNhbHQAAAAAAAAAAA$JTBozgKQiCn5yKAm3Hz0vUSX/XgfqhZloNCxDWmeDr0';
|
2017-06-06 14:40:19 +00:00
|
|
|
$c = sodium_crypto_pwhash_str_verify($testHash, $passwd);
|
|
|
|
|
var_dump($c);
|
|
|
|
|
|
|
|
|
|
$c = sodium_crypto_pwhash_str_verify($hash, $passwd);
|
|
|
|
|
var_dump($c);
|
|
|
|
|
|
|
|
|
|
$c = sodium_crypto_pwhash_str_verify($hash, 'passwd');
|
|
|
|
|
var_dump($c);
|
|
|
|
|
|
|
|
|
|
$salt = random_bytes(SODIUM_CRYPTO_PWHASH_SALTBYTES);
|
|
|
|
|
$out_len = 100;
|
|
|
|
|
$key = sodium_crypto_pwhash
|
|
|
|
|
($out_len, $passwd, $salt,
|
|
|
|
|
SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
|
2017-07-29 11:04:54 +00:00
|
|
|
SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE,
|
|
|
|
|
SODIUM_CRYPTO_PWHASH_ALG_DEFAULT);
|
2017-06-06 14:40:19 +00:00
|
|
|
var_dump(strlen($key) === $out_len);
|
2017-07-29 11:04:54 +00:00
|
|
|
$key2 = sodium_crypto_pwhash
|
|
|
|
|
($out_len, $passwd, $salt,
|
|
|
|
|
SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
|
|
|
|
|
SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE);
|
|
|
|
|
var_dump($key2 === $key);
|
2017-06-06 14:40:19 +00:00
|
|
|
?>
|
|
|
|
|
--EXPECT--
|
|
|
|
|
bool(true)
|
|
|
|
|
bool(true)
|
|
|
|
|
bool(false)
|
|
|
|
|
bool(true)
|
|
|
|
|
bool(false)
|
|
|
|
|
bool(true)
|
2017-07-29 11:04:54 +00:00
|
|
|
bool(true)
|