bug #32200 [Security/Core] work around sodium_compat issue (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit eb438a48d6f7 · 2019-06-26T20:25:43.000+02:00
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
diff --git a/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php
@@ -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', '>=');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static function isSupported()`
`26`	`26`	`return true;`
`27`	`27`	`}`
`28`	`28`
`29`		`- return \function_exists('sodium_crypto_pwhash_str') \|\| \extension_loaded('libsodium');`
	`29`	`+ return version_compare(\extension_loaded('sodium') ? \SODIUM_LIBRARY_VERSION : phpversion('libsodium'), '1.0.9', '>=');`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`