From 0239605ef1dc46537874488d9a3453d3c2ef8f13 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Mon, 8 Jul 2024 15:15:05 +0200 Subject: [PATCH] Revert "public_key, crypto: Deprecate legacy functions" This reverts commit 1e8d904ada2a0264ece549558fae80128745d464. --- lib/crypto/src/crypto.erl | 8 +++----- lib/public_key/src/public_key.erl | 11 ----------- system/doc/general_info/DEPRECATIONS | 12 ------------ 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index da5325d33bf2..e6742fd838a2 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -193,11 +193,9 @@ end %%%---------------------------------------------------------------- %% Deprecated functions --deprecated([{private_encrypt, 4, "use public_key:sign/3 instead"}, - {private_decrypt, 4, "do not use"}, - {public_encrypt, 4, "do not use"}, - {public_decrypt, 4, "use public_key:verify/4 instead"} - ]). +-deprecated([ + ]). + %%%---------------------------------------------------------------- %% Removed functions. %% diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 2105ae89d5ce..f5dbafde98f1 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -110,17 +110,6 @@ macros described here and in the User's Guide: %%---------------- %% Moved to ssh - --deprecated([{encrypt_private, 2, "use public_key:sign/3 instead"}, - {encrypt_private, 3, "use public_key:sign 4 instead"}, - {decrypt_private, 2, "do not use"}, - {decrypt_private, 3, "do not use"}, - {encrypt_public, 2, "do not use"}, - {encrypt_public, 3, "do not use"}, - {decrypt_public, 2, "use public_key:verify/4 instead"}, - {decrypt_public, 3, "use public_key:verify/5 instead"} - ]). - -removed([{ssh_decode,2, "use ssh_file:decode/2 instead"}, {ssh_encode,2, "use ssh_file:encode/2 instead"}, {ssh_hostkey_fingerprint,1, "use ssh:hostkey_fingerprint/1 instead"}, diff --git a/system/doc/general_info/DEPRECATIONS b/system/doc/general_info/DEPRECATIONS index 92058c204f4d..3e5ba5150c41 100644 --- a/system/doc/general_info/DEPRECATIONS +++ b/system/doc/general_info/DEPRECATIONS @@ -24,18 +24,6 @@ mnesia_registry:create_table/_ since=27 remove=28 code:lib_dir/2 since=27 ssl:prf/5 since=27 ssl:prf_random/0 since=27 remove=28 -public_key:decrypt_public/3 since=27 -public_key:decrypt_public/2 since=27 -public_key:encrypt_public/3 since=27 -public_key:encrypt_public/2 since=27 -public_key:decrypt_private/3 since=27 -public_key:decrypt_private/2 since=27 -public_key:encrypt_private/3 since=27 -public_key:encrypt_private/2 since=27 -crypto:public_decrypt/4 since=27 -crypto:public_encrypt/4 since=27 -crypto:private_decrypt/4 since=27 -crypto:private_encrypt/4 since=27 # # Added in OTP 26.