Merge pull request #212 from seriyps/otp-23

Make it compatible with OTP-23; add OTP-23 to travis. Fixes #207
gen-smtp · May 23, 2020 · debd38a · debd38a
2 parents c1fc246 + 66af11b
commit debd38a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: erlang
 
 matrix:
   include:
+    - otp_release: 23.0
     - otp_release: 22.3
     - otp_release: 21.3
     - otp_release: 20.3

diff --git a/rebar3 b/rebar3
diff --git a/src/smtp_util.erl b/src/smtp_util.erl
@@ -70,9 +70,23 @@ guess_FQDN_1(Hostname, {error, nxdomain = Error}) ->
 %% @doc Compute the CRAM digest of `Key' and `Data'
 -spec compute_cram_digest(Key :: binary(), Data :: binary()) -> binary().
 compute_cram_digest(Key, Data) ->
-	Bin = crypto:hmac(md5, Key, Data),
+	Bin = hmac_md5(Key, Data),
 	list_to_binary([io_lib:format("~2.16.0b", [X]) || <<X>> <= Bin]).
 
+-ifdef(OTP_RELEASE).
+  -if(?OTP_RELEASE >= 23).
+    -define(CRYPTO_MAC, true).
+  -endif.
+-endif.
+
+-ifdef(CRYPTO_MAC).
+hmac_md5(Key, Data) ->
+	crypto:mac(hmac, md5, Key, Data).
+-else.
+hmac_md5(Key, Data) ->
+	crypto:hmac(md5, Key, Data).
+-endif.
+
 %% @doc Generate a seed string for CRAM.
 -spec get_cram_string(Hostname :: string()) -> string().
 get_cram_string(Hostname) ->