Merge branch '3.4' into 4.2

* 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
symfony · Jun 26, 2019 · 40cb66f · 40cb66f
2 parents 1289f7a + 24a4e2d
commit 40cb66f
Showing 1 changed file with 1 addition and 1 deletion.
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', '>=');
     }
 
     /**