diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2010-09-22 08:30:09 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2010-09-22 08:30:09 +0000 |
| commit | 99534ddecd6efe03744a62d3b6801cec2a4dd971 (patch) | |
| tree | 00eb80c78ddbaf4dc5218fc2907ff27942cce328 /usr.bin | |
| parent | 83018e34c552b5700c5ac28bf696aaa3a17bd340 (diff) | |
ssh.1: add kexalgorithms to the -o list
ssh_config.5: format the kexalgorithms in a more consistent (prettier!) way
ok djm
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh.1 | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 18 |
2 files changed, 12 insertions, 11 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 3209a388fa2..a3d66cb19ea 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -34,8 +34,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.313 2010/09/11 21:44:20 djm Exp $ -.Dd $Mdocdate: September 11 2010 $ +.\" $OpenBSD: ssh.1,v 1.314 2010/09/22 08:30:08 jmc Exp $ +.Dd $Mdocdate: September 22 2010 $ .Dt SSH 1 .Os .Sh NAME @@ -437,6 +437,7 @@ For full details of the options listed below, and their possible values, see .It IdentityFile .It IdentitiesOnly .It KbdInteractiveDevices +.It KexAlgorithms .It LocalCommand .It LocalForward .It LogLevel diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index 6e49842a7c7..4a71e2af0bb 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/ssh_config.5 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.140 2010/09/22 05:01:29 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.141 2010/09/22 08:30:08 jmc Exp $ .Dd $Mdocdate: September 22 2010 $ .Dt SSH_CONFIG 5 .Os @@ -649,14 +649,14 @@ and .It Cm KexAlgorithms Specifies the available KEX (Key Exchange) algorithms. Multiple algorithms must be comma-separated. -The default is -.Dq ecdh-sha2-nistp256 , -.Dq ecdh-sha2-nistp384 , -.Dq ecdh-sha2-nistp521 , -.Dq diffie-hellman-group-exchange-sha256 , -.Dq diffie-hellman-group-exchange-sha1 , -.Dq diffie-hellman-group14-sha1 , -.Dq diffie-hellman-group1-sha1 . +The default is: +.Bd -literal -offset indent +ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, +diffie-hellman-group-exchange-sha256, +diffie-hellman-group-exchange-sha1, +diffie-hellman-group14-sha1, +diffie-hellman-group1-sha1 +.Ed .It Cm LocalCommand Specifies a command to execute on the local machine after successfully connecting to the server. |