Merge branch '4.2' into 4.3

nicolas-grekas · nicolas-grekas · commit f4db646bcd1c · 2019-06-26T20:29:07.000+02:00
* 4.2:
  [Security/Core] work around sodium_compat issue
  bumped Symfony version to 4.2.11
  updated VERSION for 4.2.10
  updated CHANGELOG for 4.2.10
  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/Encoder/Argon2iPasswordEncoder.php b/Encoder/Argon2iPasswordEncoder.php
@@ -51,7 +51,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', '>=');
     }
 
     /**
diff --git a/Encoder/SodiumPasswordEncoder.php b/Encoder/SodiumPasswordEncoder.php
@@ -48,7 +48,7 @@ public function __construct(int $opsLimit = null, int $memLimit = null)
 
     public static function isSupported(): bool
     {
-        return \function_exists('sodium_crypto_pwhash_str_needs_rehash') || \function_exists('Sodium\crypto_pwhash_str_needs_rehash');
+        return version_compare(\extension_loaded('sodium') ? \SODIUM_LIBRARY_VERSION : phpversion('libsodium'), '1.0.14', '>=');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public static function isSupported()`
`51`	`51`	`return true;`
`52`	`52`	`}`
`53`	`53`
`54`		`- return \function_exists('sodium_crypto_pwhash_str') \|\| \extension_loaded('libsodium');`
	`54`	`+ return version_compare(\extension_loaded('sodium') ? \SODIUM_LIBRARY_VERSION : phpversion('libsodium'), '1.0.9', '>=');`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function __construct(int $opsLimit = null, int $memLimit = null)`
`48`	`48`
`49`	`49`	`public static function isSupported(): bool`
`50`	`50`	`{`
`51`		`- return \function_exists('sodium_crypto_pwhash_str_needs_rehash') \|\| \function_exists('Sodium\crypto_pwhash_str_needs_rehash');`
	`51`	`+ return version_compare(\extension_loaded('sodium') ? \SODIUM_LIBRARY_VERSION : phpversion('libsodium'), '1.0.14', '>=');`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`