diff options
| author | Hans Nilsson <[email protected]> | 2017-03-20 10:06:39 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-03-20 10:06:39 +0100 |
| commit | 748c2d938d309940b8365ed4f6af863b8129c5bf (patch) | |
| tree | dd61988d4886499ac53bda6df1efa7bf5f1af079 /lib/ssh/src/ssh_options.erl | |
| parent | 2cc47f22e4cb775422a6a7fb1b94836e7cf51143 (diff) | |
| parent | 304e2939256d2d1d8e3ef7ccf66b3ce058b04d44 (diff) | |
| download | otp-748c2d938d309940b8365ed4f6af863b8129c5bf.tar.gz otp-748c2d938d309940b8365ed4f6af863b8129c5bf.tar.bz2 otp-748c2d938d309940b8365ed4f6af863b8129c5bf.zip | |
Merge branch 'hans/ssh/remove_option__public_key_alg/OTP-14263'
Diffstat (limited to 'lib/ssh/src/ssh_options.erl')
| -rw-r--r-- | lib/ssh/src/ssh_options.erl | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl index 395be6b220..a882a01eaf 100644 --- a/lib/ssh/src/ssh_options.erl +++ b/lib/ssh/src/ssh_options.erl @@ -200,17 +200,6 @@ save({K,V}, _, _) when K == reuseaddr ; save({allow_user_interaction,V}, Opts, Vals) -> save({user_interaction,V}, Opts, Vals); -save({public_key_alg,V}, Defs, Vals) -> % To remove in OTP-20 - New = case V of - 'ssh-rsa' -> ['ssh-rsa', 'ssh-dss']; - ssh_rsa -> ['ssh-rsa', 'ssh-dss']; - 'ssh-dss' -> ['ssh-dss', 'ssh-rsa']; - ssh_dsa -> ['ssh-dss', 'ssh-rsa']; - _ -> error({eoptions, {public_key_alg,V}, - "Unknown algorithm, try pref_public_key_algs instead"}) - end, - save({pref_public_key_algs,New}, Defs, Vals); - %% Special case for socket options 'inet' and 'inet6' save(Inet, Defs, OptMap) when Inet==inet ; Inet==inet6 -> save({inet,Inet}, Defs, OptMap); |