Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit 40cb66fb26bf · 2019-06-26T20:27:58.000+02:00
* 3.4:
  [Security/Core] work around sodium_compat issue
  bumped Symfony version to 3.4.30
  updated VERSION for 3.4.29
  update CONTRIBUTORS for 3.4.29
  updated CHANGELOG for 3.4.29
diff --git a/Core/Encoder/Argon2iPasswordEncoder.php b/Core/Encoder/Argon2iPasswordEncoder.php
@@ -47,7 +47,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
`@@ -47,7 +47,7 @@ public static function isSupported()`
`47`	`47`	`return true;`
`48`	`48`	`}`
`49`	`49`
`50`		`- return \function_exists('sodium_crypto_pwhash_str') \|\| \extension_loaded('libsodium');`
	`50`	`+ return version_compare(\extension_loaded('sodium') ? \SODIUM_LIBRARY_VERSION : phpversion('libsodium'), '1.0.9', '>=');`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`