Skip to content

fix(deprecation): :crypto.hmac -> :crypto.mac, Bitwise.^^^ -> Bitwise.bxor #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielberkompas merged 1 commit into from
Jun 5, 2021
Merged

fix(deprecation): :crypto.hmac -> :crypto.mac, Bitwise.^^^ -> Bitwise.bxor #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lib/ex_twilio/request_validator.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,14 @@ defmodule ExTwilio.RequestValidator do
|> Enum.join()
end

defp compute_hmac(data, key), do: :crypto.hmac(:sha, key, data)
defp compute_hmac(data, key), do: hmac(:sha, key, data)

# TODO: remove when we require OTP 22
if System.otp_release() >= "22" do
defp hmac(digest, key, data), do: :crypto.mac(:hmac, digest, key, data)
else
defp hmac(digest, key, data), do: :crypto.hmac(digest, key, data)
end

# Implementation taken from Plug.Crypto
# https://github.com/elixir-plug/plug/blob/master/lib/plug/crypto.ex
Expand All @@ -48,7 +55,7 @@ defmodule ExTwilio.RequestValidator do
end

defp secure_compare(<<x, left::binary>>, <<y, right::binary>>, acc) do
xorred = x ^^^ y
xorred = bxor(x, y)
secure_compare(left, right, acc ||| xorred)
end

Expand Down