Merge branch 'ingela/corrct-otp-internal'

* ingela/corrct-otp-internal:
  ssl, public_key, crypto: Change deprecated to removed

2 files changed, 86 insertions, 86 deletions

diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index fda7a2cd8a..4c15d24c51 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -63,178 +63,178 @@ obsolete_1(crypto, rand_bytes, 1) ->
 %% *** CRYPTO added in R16B01 ***
 
 obsolete_1(crypto, md4, 1) ->
-    {deprecated, {crypto, hash, 2}};
+    {removed, {crypto, hash, 2}, "20.0"};
 obsolete_1(crypto, md5, 1) ->
-    {deprecated, {crypto, hash, 2}};
+    {removed, {crypto, hash, 2}, "20.0"};
 obsolete_1(crypto, sha, 1) ->
-    {deprecated, {crypto, hash, 2}};
+    {removed, {crypto, hash, 2}, "20.0"};
 
 obsolete_1(crypto, md4_init, 0) ->
-    {deprecated, {crypto, hash_init, 1}};
+    {removed, {crypto, hash_init, 1}, "20.0"};
 obsolete_1(crypto, md5_init, 0) ->
-    {deprecated, {crypto, hash_init, 1}};
+    {removed, {crypto, hash_init, 1}, "20.0"};
 obsolete_1(crypto, sha_init, 0) ->
-    {deprecated, {crypto, hash_init, 1}};
+    {removed, {crypto, hash_init, 1}, "20.0"};
 
 obsolete_1(crypto, md4_update, 2) ->
-    {deprecated, {crypto, hash_update, 2}};
+    {removed, {crypto, hash_update, 2}, "20.0"};
 obsolete_1(crypto, md5_update, 2) ->
-    {deprecated, {crypto, hash_update, 2}};
+    {removed, {crypto, hash_update, 2}, "20.0"};
 obsolete_1(crypto, sha_update, 2) ->
-    {deprecated, {crypto, hash_update, 2}};
+    {removed, {crypto, hash_update, 2}, "20.0"};
 
 obsolete_1(crypto, md4_final, 1) ->
-    {deprecated, {crypto, hash_final, 1}};
+    {removed, {crypto, hash_final, 1}, "20.0"};
 obsolete_1(crypto, md5_final, 1) ->
-    {deprecated, {crypto, hash_final, 1}};
+    {removed, {crypto, hash_final, 1}, "20.0"};
 obsolete_1(crypto, sha_final, 1) ->
-    {deprecated, {crypto, hash_final, 1}};
+    {removed, {crypto, hash_final, 1}, "20.0"};
 
 obsolete_1(crypto, md5_mac, 2) ->
-    {deprecated, {crypto, hmac, 3}};
+    {removed, {crypto, hmac, 3}, "20.0"};
 obsolete_1(crypto, sha_mac, 2) ->
-    {deprecated, {crypto, hmac, 3}};
+    {removed, {crypto, hmac, 3}, "20.0"};
 obsolete_1(crypto, sha_mac, 3) ->
-    {deprecated, {crypto, hmac, 4}};
+    {removed, {crypto, hmac, 4}, "20.0"};
 
 obsolete_1(crypto, sha_mac_96, 2) ->
-    {deprecated, {crypto, hmac, 4}};
+    {removed, {crypto, hmac, 4}, "20.0"};
 obsolete_1(crypto, md5_mac_96, 2) ->
-    {deprecated, {crypto, hmac, 4}};
+    {removed, {crypto, hmac, 4}, "20.0"};
 
 obsolete_1(crypto, rsa_sign, 2) ->
-    {deprecated, {crypto, sign, 4}};
+    {removed, {crypto, sign, 4}, "20.0"};
 obsolete_1(crypto, rsa_sign, 3) ->
-    {deprecated, {crypto, sign, 4}};
+    {removed, {crypto, sign, 4}, "20.0"};
 obsolete_1(crypto, rsa_verify, 3) ->
-    {deprecated, {crypto, verify, 5}};
+    {removed, {crypto, verify, 5}, "20.0"};
 obsolete_1(crypto, rsa_verify, 4) ->
-    {deprecated, {crypto, verify, 5}};
+    {removed, {crypto, verify, 5}, "20.0"};
 
 obsolete_1(crypto, dss_sign, 2) ->
-    {deprecated, {crypto, sign, 4}};
+    {removed, {crypto, sign, 4}, "20.0"};
 obsolete_1(crypto, dss_sign, 3) ->
-    {deprecated, {crypto, sign, 4}};
+    {removed, {crypto, sign, 4}, "20.0"};
 
 obsolete_1(crypto, dss_verify, 3) ->
-    {deprecated, {crypto, verify, 5}};
+    {removed, {crypto, verify, 5}, "20.0"};
 obsolete_1(crypto, dss_verify, 4) ->
-    {deprecated, {crypto, verify, 5}};
+    {removed, {crypto, verify, 5}, "20.0"};
 
 obsolete_1(crypto, mod_exp, 3) ->
-    {deprecated, {crypto, mod_pow, 3}};
+    {removed, {crypto, mod_pow, 3}, "20.0"};
 
 obsolete_1(crypto, dh_compute_key, 3) ->
-    {deprecated, {crypto, compute_key, 4}};
+    {removed, {crypto, compute_key, 4}, "20.0"};
 obsolete_1(crypto, dh_generate_key, 1) ->
-    {deprecated, {crypto, generate_key, 2}};
+    {removed, {crypto, generate_key, 2}, "20.0"};
 obsolete_1(crypto, dh_generate_key, 2) ->
-    {deprecated, {crypto, generate_key, 3}};
+    {removed, {crypto, generate_key, 3}, "20.0"};
 
 obsolete_1(crypto, des_cbc_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto, des3_cbc_encrypt, 5) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto, des_ecb_encrypt, 2) ->
-    {deprecated, {crypto, block_encrypt, 3}};
+    {removed, {crypto, block_encrypt, 3}, "20.0"};
 obsolete_1(crypto, des_ede3_cbc_encrypt, 5) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto, des_cfb_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto, des3_cfb_encrypt, 5) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto, blowfish_ecb_encrypt, 2) ->
-    {deprecated, {crypto, block_encrypt, 3}};
+    {removed, {crypto, block_encrypt, 3}, "20.0"};
 obsolete_1(crypto, blowfish_cbc_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto, blowfish_cfb64_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto, blowfish_ofb64_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto, aes_cfb_128_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto, aes_cbc_128_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto, aes_cbc_256_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto,rc2_cbc_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 obsolete_1(crypto,rc2_40_cbc_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+    {removed, {crypto, block_encrypt, 4}, "20.0"};
 
 obsolete_1(crypto, des_cbc_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto, des3_cbc_decrypt, 5) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto, des_ecb_decrypt, 2) ->
-    {deprecated, {crypto, block_decrypt, 3}};
+    {removed, {crypto, block_decrypt, 3}, "20.0"};
 obsolete_1(crypto, des_ede3_cbc_decrypt, 5) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto, des_cfb_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto, des3_cfb_decrypt, 5) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto, blowfish_ecb_decrypt, 2) ->
-    {deprecated, {crypto, block_decrypt, 3}};
+    {removed, {crypto, block_decrypt, 3}, "20.0"};
 obsolete_1(crypto, blowfish_cbc_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto, blowfish_cfb64_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto, blowfish_ofb64_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto, aes_cfb_128_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto, aes_cbc_128_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto, aes_cbc_256_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto,rc2_cbc_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 obsolete_1(crypto,rc2_40_cbc_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+    {removed, {crypto, block_decrypt, 4}, "20.0"};
 
 obsolete_1(crypto, aes_ctr_stream_decrypt, 2) ->
-    {deprecated, {crypto, stream_decrypt, 2}};
+    {removed, {crypto, stream_decrypt, 2}, "20.0"};
 obsolete_1(crypto, aes_ctr_stream_encrypt, 2) ->
-    {deprecated, {crypto, stream_encrypt, 2}};
+    {removed, {crypto, stream_encrypt, 2}, "20.0"};
 obsolete_1(crypto, aes_ctr_decrypt, 3) ->
-    {deprecated, {crypto, stream_decrypt, 2}};
+    {removed, {crypto, stream_decrypt, 2}, "20.0"};
 obsolete_1(crypto, aes_ctr_encrypt, 3) ->
-    {deprecated, {crypto, stream_encrypt, 2}};
+    {removed, {crypto, stream_encrypt, 2}, "20.0"};
 obsolete_1(crypto, rc4_encrypt, 2) ->
-    {deprecated, {crypto, stream_encrypt, 2}};
+    {removed, {crypto, stream_encrypt, 2}, "20.0"};
 obsolete_1(crypto, rc4_encrypt_with_state, 2) ->
-    {deprecated, {crypto, stream_encrypt, 2}};
+    {removed, {crypto, stream_encrypt, 2}, "20.0"};
 obsolete_1(crypto, aes_ctr_stream_init, 2) ->
-    {deprecated, {crypto, stream_init, 3}};
+    {removed, {crypto, stream_init, 3}, "20.0"};
 obsolete_1(crypto, rc4_set_key, 1) ->
-    {deprecated, {crypto, stream_init, 2}};
+    {removed, {crypto, stream_init, 2}, "20.0"};
 
 obsolete_1(crypto, rsa_private_decrypt, 3) ->
-    {deprecated, {crypto, private_decrypt, 4}};
+    {removed, {crypto, private_decrypt, 4}, "20.0"};
 obsolete_1(crypto, rsa_public_decrypt, 3) ->
-    {deprecated, {crypto, public_decrypt, 4}};
+    {removed, {crypto, public_decrypt, 4}, "20.0"};
 obsolete_1(crypto, rsa_private_encrypt, 3) ->
-    {deprecated, {crypto, private_encrypt, 4}};
+    {removed, {crypto, private_encrypt, 4}, "20.0"};
 obsolete_1(crypto, rsa_public_encrypt, 3) ->
-    {deprecated, {crypto, public_encrypt, 4}};
+    {removed, {crypto, public_encrypt, 4}, "20.0"};
 
 obsolete_1(crypto, des_cfb_ivec, 2) ->
-    {deprecated, {crypto, next_iv, 3}};
+    {removed, {crypto, next_iv, 3}, "20.0"};
 obsolete_1(crypto,des_cbc_ivec, 1) ->
-    {deprecated, {crypto, next_iv, 2}};
+    {removed, {crypto, next_iv, 2}, "20.0"};
 obsolete_1(crypto, aes_cbc_ivec, 1) ->
-    {deprecated, {crypto, next_iv, 2}};
+    {removed, {crypto, next_iv, 2}, "20.0"};
 
 obsolete_1(crypto,info, 0) ->
-    {deprecated, {crypto, module_info, 0}};
+    {removed, {crypto, module_info, 0}, "20.0"};
 
 obsolete_1(crypto, strong_rand_mpint, 3) ->
-    {deprecated, "needed only by deprecated functions"};
+    {removed, "removed in 20.0; only needed by removed functions"};
 obsolete_1(crypto, erlint, 1) ->
-    {deprecated, "needed only by deprecated functions"};
+    {removed, "removed in 20.0; only needed by removed functions"};
 obsolete_1(crypto, mpint, 1) ->
-    {deprecated, "needed only by deprecated functions"};
+    {removed, "removed in 20.0; only needed by removed functions"};
 
 
 %% *** SNMP ***
@@ -387,13 +387,13 @@ obsolete_1(erlang, concat_binary, 1) ->
 
 %% Added in R14A.
 obsolete_1(ssl, peercert, 2) ->
-    {deprecated,"deprecated (will be removed in R15A); use ssl:peercert/1 and public_key:pkix_decode_cert/2 instead"};
+    {removed ,"removed in R15A; use ssl:peercert/1 and public_key:pkix_decode_cert/2 instead"};
 
 %% Added in R14B.
 obsolete_1(public_key, pem_to_der, 1) ->
-    {deprecated,"deprecated (will be removed in R15A); use file:read_file/1 and public_key:pem_decode/1"};
+    {removed,"removed in R15A; use file:read_file/1 and public_key:pem_decode/1"};
 obsolete_1(public_key, decode_private_key, A) when A =:= 1; A =:= 2 ->
-    {deprecated,{public_key,pem_entry_decode,1},"R15A"};
+    {removed, "removed in R15A; use public_key:pem_entry_decode/1"};
 
 %% Added in R14B03.
 obsolete_1(docb_gen, _, _) ->
@@ -415,10 +415,10 @@ obsolete_1(inviso, _, _) ->
 obsolete_1(gs, _, _) ->
     {removed,"the gs application has been removed; use the wx application instead"};
 obsolete_1(ssh, sign_data, 2) ->
-    {deprecated,"deprecated (will be removed in R16A); use public_key:pem_decode/1, public_key:pem_entry_decode/1 "
+    {removed,"removed in R16A; use public_key:pem_decode/1, public_key:pem_entry_decode/1 "
      "and public_key:sign/3 instead"};
 obsolete_1(ssh, verify_data, 3) ->
-    {deprecated,"deprecated (will be removed in R16A); use public_key:ssh_decode/1, and public_key:verify/4 instead"};
+    {removed,"removed in R16A; use public_key:ssh_decode/1, and public_key:verify/4 instead"};
 
 %% Added in R16
 obsolete_1(wxCalendarCtrl, enableYearChange, _) -> %% wx bug documented?
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 4af1c26c0f..fd7de65302 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -2099,11 +2099,11 @@ otp_5362(Config) when is_list(Config) ->
             [{2,erl_lint,disallowed_nowarn_bif_clash}],[]}},
 
 	  {call_deprecated_function,
-	   <<"t(X) -> crypto:md5(X).">>,
+	   <<"t(X) -> calendar:local_time_to_universal_time(X).">>,
 	   [],
 	   {warnings,
-            [{1,erl_lint,{deprecated,{crypto,md5,1},
-			  {crypto,hash,2}, "a future release"}}]}},
+            [{1,erl_lint,{deprecated,{calendar,local_time_to_universal_time,1},
+			  {calendar,local_time_to_universal_time_dst,1}, "a future release"}}]}},
 
 	  {call_removed_function,
 	   <<"t(X) -> regexp:match(X).">>,