Skip to content

Improve error message of an engine fails to seed from the CSPRNG #9160

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 1 commit into from
Jul 30, 2022
Merged

Improve error message of an engine fails to seed from the CSPRNG #9160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ext/random/engine_mt19937.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ PHP_METHOD(Random_Engine_Mt19937, __construct)

if (seed_is_null) {
/* MT19937 has a very large state, uses CSPRNG for seeding only */
if (php_random_bytes_silent(&seed, sizeof(zend_long)) == FAILURE) {
zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
if (php_random_bytes_throw(&seed, sizeof(zend_long)) == FAILURE) {
zend_throw_exception(spl_ce_RuntimeException, "Failed to generate a random seed", 0);
RETURN_THROWS();
}
}
Expand Down
4 changes: 2 additions & 2 deletions ext/random/engine_pcgoneseq128xslrr64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ PHP_METHOD(Random_Engine_PcgOneseq128XslRr64, __construct)
ZEND_PARSE_PARAMETERS_END();

if (seed_is_null) {
if (php_random_bytes_silent(&state->state, sizeof(php_random_uint128_t)) == FAILURE) {
zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
if (php_random_bytes_throw(&state->state, sizeof(php_random_uint128_t)) == FAILURE) {
zend_throw_exception(spl_ce_RuntimeException, "Failed to generate a random seed", 0);
RETURN_THROWS();
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions ext/random/engine_xoshiro256starstar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ PHP_METHOD(Random_Engine_Xoshiro256StarStar, __construct)
ZEND_PARSE_PARAMETERS_END();

if (seed_is_null) {
if (php_random_bytes_silent(&state->state, 32) == FAILURE) {
zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
if (php_random_bytes_throw(&state->state, 32) == FAILURE) {
zend_throw_exception(spl_ce_RuntimeException, "Failed to generate a random seed", 0);
RETURN_THROWS();
}
} else {
Expand Down