tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- jmc@cvs.openbsd.org 2010/09/22 08:30:08 

[ssh.1 ssh_config.5]
     ssh.1: add kexalgorithms to the -o list
     ssh_config.5: format the kexalgorithms in a more consistent
     (prettier!) way
     ok djm
This commit is contained in:
Damien Miller 2010-09-24 22:11:53 +10:00
parent d5f62bf280
commit 7fe2b1fec3
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -38,6 +38,12 @@
selection of which key exchange methods are used by ssh(1) and sshd(8) selection of which key exchange methods are used by ssh(1) and sshd(8)
and their order of preference. and their order of preference.
ok markus@ ok markus@
- jmc@cvs.openbsd.org 2010/09/22 08:30:08
[ssh.1 ssh_config.5]
ssh.1: add kexalgorithms to the -o list
ssh_config.5: format the kexalgorithms in a more consistent
(prettier!) way
ok djm
20100910 20100910
- (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact

5
ssh.1
View File

@ -34,8 +34,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: ssh.1,v 1.314 2010/09/22 08:30:08 jmc Exp $
.Dd $Mdocdate: September 11 2010 $ .Dd $Mdocdate: September 22 2010 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -437,6 +437,7 @@ For full details of the options listed below, and their possible values, see
.It IdentityFile .It IdentityFile
.It IdentitiesOnly .It IdentitiesOnly
.It KbdInteractiveDevices .It KbdInteractiveDevices
.It KexAlgorithms
.It LocalCommand .It LocalCommand
.It LocalForward .It LocalForward
.It LogLevel .It LogLevel

18
ssh_config.5
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .Dd $Mdocdate: September 22 2010 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -649,14 +649,14 @@ and
.It Cm KexAlgorithms .It Cm KexAlgorithms
Specifies the available KEX (Key Exchange) algorithms. Specifies the available KEX (Key Exchange) algorithms.
Multiple algorithms must be comma-separated. Multiple algorithms must be comma-separated.
The default is The default is:
.Dq ecdh-sha2-nistp256 , .Bd -literal -offset indent
.Dq ecdh-sha2-nistp384 , ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
.Dq ecdh-sha2-nistp521 , diffie-hellman-group-exchange-sha256,
.Dq diffie-hellman-group-exchange-sha256 , diffie-hellman-group-exchange-sha1,
.Dq diffie-hellman-group-exchange-sha1 , diffie-hellman-group14-sha1,
.Dq diffie-hellman-group14-sha1 , diffie-hellman-group1-sha1
.Dq diffie-hellman-group1-sha1 . .Ed
.It Cm LocalCommand .It Cm LocalCommand
Specifies a command to execute on the local machine after successfully Specifies a command to execute on the local machine after successfully
connecting to the server. connecting to the server.