daniel has submitted this change. (
https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/27896 )
Change subject: server_cb: Fix issue with Erlang/OTP 24
......................................................................
server_cb: Fix issue with Erlang/OTP 24
Erlang/OTP 24 dropped crypto:hmac, so use crpyto:mac(hmac, ...) instead.
See
https://github.com/riverrun/one_time_pass_ecto/issues/9
Change-Id: I7d916eb1f1435b3ac3fc362bb2f4daa7bbb8bb1a
---
M src/server_cb.erl
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/server_cb.erl b/src/server_cb.erl
index c7b0ed1..dc7fe59 100644
--- a/src/server_cb.erl
+++ b/src/server_cb.erl
@@ -85,7 +85,13 @@
Autn6 = binary_part(Autn, 0, 6),
K = <<Ck:16/binary, Ik:16/binary>>,
S = <<16, VplmnId:3/binary, 0, 3, Autn6:6/binary, 0, 6>>,
- crypto:hmac(sha256, K, S, 32).
+ Release = erlang:system_info(otp_release),
+ if
+ Release >= "24" ->
+ crypto:macN(hmac, sha256, K, S, 32);
+ true ->
+ crypto:hmac(sha256, K, S, 32)
+ end.
-spec req_num_of_vec([tuple()]) -> int_or_false().
req_num_of_vec([#'Requested-EUTRAN-Authentication-Info'{'Number-Of-Requested-Vectors'=[]}])
-> false;
--
To view, visit
https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/27896
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo_dia2gsup
Gerrit-Branch: master
Gerrit-Change-Id: I7d916eb1f1435b3ac3fc362bb2f4daa7bbb8bb1a
Gerrit-Change-Number: 27896
Gerrit-PatchSet: 3
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged