aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-02-13 10:30:13 +0100
committerIngela Anderton Andin <[email protected]>2012-02-13 10:30:13 +0100
commite0222e33523e9d01d1ec82d88560c30375a255cd (patch)
tree2d184ca752918cead43972aa6d6377de6f59b70c /lib/stdlib
parentba4d72d0462c3e5df038c36b5194e5b8c9eacf92 (diff)
parent86231a380b27fc262e48aa8c3f0372d4d2056682 (diff)
downloadotp-e0222e33523e9d01d1ec82d88560c30375a255cd.tar.gz
otp-e0222e33523e9d01d1ec82d88560c30375a255cd.tar.bz2
otp-e0222e33523e9d01d1ec82d88560c30375a255cd.zip
Merge branch 'maint'
* maint: Correct access flag handling in sftpd Client fallbacks to ipv4 if connection is refused with ipv6 Cleaned up code so that ssh_file can become a template for a documented ssh_keys behavior Test case maintenance Better handling of IPv6 Ssh daemon handles RSA host keys Removed no longer needed code Use the public_key application for all public key handling
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/otp_internal.erl9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 6e8af0f3f6..b9fbef9ed0 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -354,11 +354,14 @@ obsolete_1(inviso, _, _) ->
%% Added in R15B01.
obsolete_1(gs, _, _) ->
{deprecated,"the gs application has been deprecated and will be removed in R16; 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 "
+ "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"};
obsolete_1(_, _, _) ->
no.
-
-spec is_snmp_agent_function(atom(), byte()) -> boolean().
is_snmp_agent_function(c, 1) -> true;