Skip to content

password: Use php_random_bytes_throw in php_password_make_salt #10393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 23, 2023
Merged

password: Use php_random_bytes_throw in php_password_make_salt #10393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fd957d
password: Use `php_random_bytes_throw` in `php_password_make_salt`
TimWolla Jan 21, 2023
e847b24
[ci skip] NEWS/UPGRADING
TimWolla Jan 23, 2023
d0ff661
Merge branch 'master' into password-csprng-throw
TimWolla Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ PHP NEWS
. Make array_pad's $length warning less confusing. (nielsdos)
. E_WARNING emitted by strtok in the caase both arguments are not provided when
starting tokenisation. (David Carlier)
. password_hash() will now chain the original RandomException to the ValueError
on salt generation failure. (timwolla)

- Streams:
. Fixed bug #51056: blocking fread() will block even if data is available.
Expand Down
2 changes: 2 additions & 0 deletions UPGRADING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ PHP 8.3 UPGRADE NOTES
can have. Before, it was only possible to add at most 1048576 elements at a
time.
. strtok() raises a warning in the case token is not provided when starting tokenization.
. password_hash() will now chain the underlying Random\RandomException
as the ValueError’s $previous Exception when salt generation fails.

========================================
6. New Functions
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/password.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static zend_string* php_password_make_salt(size_t length) /* {{{ */
}

buffer = zend_string_alloc(length * 3 / 4 + 1, 0);
if (FAILURE == php_random_bytes_silent(ZSTR_VAL(buffer), ZSTR_LEN(buffer))) {
if (FAILURE == php_random_bytes_throw(ZSTR_VAL(buffer), ZSTR_LEN(buffer))) {
zend_value_error("Unable to generate salt");
zend_string_release_ex(buffer, 0);
return NULL;
Expand Down