diff options
author | Charles R. Portwood II <charlesportwoodii@erianna.com> | 2017-06-18 19:17:43 -0400 |
---|---|---|
committer | Sara Golemon <pollita@php.net> | 2017-06-18 19:19:20 -0400 |
commit | 498716c2f702ed7623fb26653dd3368ab2b59e7b (patch) | |
tree | 4817df815f6176de94262d1a1a39f09dc2c3296b /ext/standard/password.c | |
parent | d3c593a5858959810de6fd398206f18d0fffdf10 (diff) | |
download | php-git-498716c2f702ed7623fb26653dd3368ab2b59e7b.tar.gz |
Compatibility with libargon2 versions 20161029 and 20160821
libargon2 20161029 introduces the `type` parameter to the argon2_encodedlen
function that is not present in 20160821. This change ensures the Argon2
functionality introduced in RFC `argon2_password_hash` is compatible with
both versions, as the library version that package maintainers package may
differ.
Diffstat (limited to 'ext/standard/password.c')
-rw-r--r-- | ext/standard/password.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/password.c b/ext/standard/password.c index 2d04badd1b..5e1704fe69 100644 --- a/ext/standard/password.c +++ b/ext/standard/password.c @@ -545,6 +545,9 @@ PHP_FUNCTION(password_hash) threads, (uint32_t)salt_len, out_len +#if HAVE_ARGON2ID + , type +#endif ); out = emalloc(out_len + 1); |