diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-08-24 08:57:57 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-08-24 08:57:57 +0200 |
| commit | 574a68e84c92a8a44ea2e5d18a1cd2025892d496 (patch) | |
| tree | 7ab50c40c457d500cdc2432ca3cc974d8f0959b1 /lib/stdlib/src/otp_internal.erl | |
| parent | 7ed6bbd4e8bb88958bd45f85e3ef8af39c9f894f (diff) | |
| parent | 12dfe961aeaf1a826d851361a24519e54d8ef119 (diff) | |
| download | otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.tar.gz otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.tar.bz2 otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.zip | |
Merge branch 'ia/public_key_api/OTP-8722' into dev
* ia/public_key_api/OTP-8722:
Revise the public_key API
Resolved, version is now 0.8.
Conflicts:
lib/public_key/vsn.mk
Diffstat (limited to 'lib/stdlib/src/otp_internal.erl')
| -rw-r--r-- | lib/stdlib/src/otp_internal.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index 1514414e48..5c52dfcbf0 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -361,6 +361,12 @@ obsolete_1(erlang, concat_binary, 1) -> obsolete_1(ssl, peercert, 2) -> {deprecated,"deprecated (will be 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"}; +obsolete_1(public_key, decode_private_key, A) when A =:= 1; A =:= 2 -> + {deprecated,{public_key,pem_entry_decode,1},"R15A"}; + obsolete_1(_, _, _) -> no. |