diff options
| author | lain <lain@soykaf.club> | 2020-05-13 07:45:35 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-13 07:45:35 +0000 |
| commit | 3210e939bf3b3f3c80a6774ae4d4a531ef5491cd (patch) | |
| tree | ef51aae2e3cbc43a506af4ad940a5be63fdb5e70 /lib/pleroma/user.ex | |
| parent | c74018e6a7a19a40a75c343ddadc199d9990597e (diff) | |
| parent | b46811a07444187e7765f439e933f214c0a0aeb3 (diff) | |
| download | pleroma-3210e939bf3b3f3c80a6774ae4d4a531ef5491cd.tar.gz | |
Merge branch 'upgrade-comeonin' into 'develop'
Upgrade Comeonin to v5
See merge request pleroma/pleroma!2523
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index a86cc3202..cba391072 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -9,7 +9,6 @@ defmodule Pleroma.User do import Ecto.Query import Ecto, only: [assoc: 2] - alias Comeonin.Pbkdf2 alias Ecto.Multi alias Pleroma.Activity alias Pleroma.Config @@ -1926,7 +1925,7 @@ defmodule Pleroma.User do defp put_password_hash( %Ecto.Changeset{valid?: true, changes: %{password: password}} = changeset ) do - change(changeset, password_hash: Pbkdf2.hashpwsalt(password)) + change(changeset, password_hash: Pbkdf2.hash_pwd_salt(password)) end defp put_password_hash(changeset), do: changeset |