[Security] minor improvement

nicolas-grekas · nicolas-grekas · commit 567cb27a1d5d · 2019-06-13T16:09:13.000+02:00
diff --git a/src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php
@@ -48,11 +48,15 @@ public function __construct(int $opsLimit = null, int $memLimit = null)
 
     public static function isSupported(): bool
     {
+        if (\extension_loaded('libsodium') || \function_exists('sodium_crypto_pwhash_str')) {
+            return true;
+        }
+
         if (class_exists('ParagonIE_Sodium_Compat') && method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {
             return \ParagonIE_Sodium_Compat::crypto_pwhash_is_available();
         }
 
-        return \function_exists('sodium_crypto_pwhash_str') || \extension_loaded('libsodium');
+        return false;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,15 @@ public function __construct(int $opsLimit = null, int $memLimit = null)`
`48`	`48`
`49`	`49`	`public static function isSupported(): bool`
`50`	`50`	`{`
	`51`	`+ if (\extension_loaded('libsodium') \|\| \function_exists('sodium_crypto_pwhash_str')) {`
	`52`	`+ return true;`
	`53`	`+ }`
	`54`	`+`
`51`	`55`	`if (class_exists('ParagonIE_Sodium_Compat') && method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {`
`52`	`56`	`return \ParagonIE_Sodium_Compat::crypto_pwhash_is_available();`
`53`	`57`	`}`
`54`	`58`
`55`		`- return \function_exists('sodium_crypto_pwhash_str') \|\| \extension_loaded('libsodium');`
	`59`	`+ return false;`
`56`	`60`	`}`
`57`	`61`
`58`	`62`	`/**`