Skip to content
This repository has been archived by the owner on May 31, 2024. It is now read-only.

Commit

Permalink
Merge branch '3.4' into 4.2
Browse files Browse the repository at this point in the history
* 3.4:
  [FrameworkBundle] Fix calling Client::getProfile() before sending a request
  Fix type error
  [Security/Core] Don't use ParagonIE_Sodium_Compat
  collect called listeners information only once
  add test to avoid regressions
  fix typos
  Turkish translation added to Form Component
  • Loading branch information
fabpot committed Jun 26, 2019
2 parents fb62dca + e527570 commit 1289f7a
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions Core/Encoder/Argon2iPasswordEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ public static function isSupported()
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');
}

Expand Down

0 comments on commit 1289f7a

Please sign in to comment.