ENGCOM-5500: additional check for correct version of sodium #23866

magento-engcom-team · magento-engcom-team · commit 2e7aa88c9a85 · 2019-07-27T17:20:19.000-05:00
- Merge Pull Request #23866 from matei/magento2:fix-issue-23405 - Merged commits: 1. 856d3e9
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -162,7 +162,7 @@ public function __construct(
      */
     public function getLatestHashVersion(): int
     {
-        if (extension_loaded('sodium')) {
+        if (extension_loaded('sodium') && defined('SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13')) {
             return self::HASH_VERSION_ARGON2ID13;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function __construct(`
`162`	`162`	`*/`
`163`	`163`	`public function getLatestHashVersion(): int`
`164`	`164`	`{`
`165`		`- if (extension_loaded('sodium')) {`
	`165`	`+ if (extension_loaded('sodium') && defined('SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13')) {`
`166`	`166`	`return self::HASH_VERSION_ARGON2ID13;`
`167`	`167`	`}`
`168`	`168`