diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-07-10 06:21:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-07-15 15:38:02 +1000 |
commit | 3a1638dda19bbc73d0ae02b4c251ce08e564b4b9 (patch) | |
tree | e74e4219344349a4f9a4393aa4c2c6b7baecb127 /scp.1 | |
parent | 16db0a7ee9a87945cc594d13863cfcb86038db59 (diff) |
upstream commit
Turn off DSA by default; add HostKeyAlgorithms to the
server and PubkeyAcceptedKeyTypes to the client side, so it still can be
tested or turned back on; feedback and ok djm@
Upstream-ID: 8450a9e6d83f80c9bfed864ff061dfc9323cec21
Diffstat (limited to 'scp.1')
-rw-r--r-- | scp.1 | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -8,9 +8,9 @@ | |||
8 | .\" | 8 | .\" |
9 | .\" Created: Sun May 7 00:14:37 1995 ylo | 9 | .\" Created: Sun May 7 00:14:37 1995 ylo |
10 | .\" | 10 | .\" |
11 | .\" $OpenBSD: scp.1,v 1.66 2015/01/30 11:43:14 djm Exp $ | 11 | .\" $OpenBSD: scp.1,v 1.67 2015/07/10 06:21:53 markus Exp $ |
12 | .\" | 12 | .\" |
13 | .Dd $Mdocdate: January 30 2015 $ | 13 | .Dd $Mdocdate: July 10 2015 $ |
14 | .Dt SCP 1 | 14 | .Dt SCP 1 |
15 | .Os | 15 | .Os |
16 | .Sh NAME | 16 | .Sh NAME |
@@ -170,6 +170,7 @@ For full details of the options listed below, and their possible values, see | |||
170 | .It PreferredAuthentications | 170 | .It PreferredAuthentications |
171 | .It Protocol | 171 | .It Protocol |
172 | .It ProxyCommand | 172 | .It ProxyCommand |
173 | .It PubkeyAcceptedKeyTypes | ||
173 | .It PubkeyAuthentication | 174 | .It PubkeyAuthentication |
174 | .It RekeyLimit | 175 | .It RekeyLimit |
175 | .It RhostsRSAAuthentication | 176 | .It RhostsRSAAuthentication |