[Security/Core] work around sodium_compat issue

nicolas-grekas · nicolas-grekas · commit 24a4e2dd17ee · 2019-06-26T20:07:24.000+02:00
diff --git a/Core/Encoder/Argon2iPasswordEncoder.php b/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`	`/**`