Skip to content

Commit

Permalink
bug #32200 [Security/Core] work around sodium_compat issue (nicolas-g…
Browse files Browse the repository at this point in the history
…rekas)

This PR was merged into the 3.4 branch.

Discussion
----------

[Security/Core] work around sodium_compat issue

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

As reported by @mbabker in #32169
1.0.9 per https://github.com/jedisct1/libsodium/releases/tag/1.0.9

Commits
-------

df50685 [Security/Core] work around sodium_compat issue
  • Loading branch information
nicolas-grekas committed Jun 26, 2019
2 parents fe5a4ee + df50685 commit eb438a4
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -26,7 +26,7 @@ public static function isSupported()
return true;
}

return \function_exists('sodium_crypto_pwhash_str') || \extension_loaded('libsodium');
return version_compare(\extension_loaded('sodium') ? \SODIUM_LIBRARY_VERSION : phpversion('libsodium'), '1.0.9', '>=');
}

/**
Expand Down

0 comments on commit eb438a4

Please sign in to comment.