diff options
| author | djm <djm> | 2010-09-24 12:11:14 +0000 |
|---|---|---|
| committer | djm <djm> | 2010-09-24 12:11:14 +0000 |
| commit | b94d6d23e18de0c96fc879a55b0038f3439b6445 (patch) | |
| tree | 589d4e7cae3b6a985221bb44594bffd71967a542 /servconf.h | |
| parent | 3ce5229f5979266ffc973d85773e27643bd799a3 (diff) | |
| download | openssh-b94d6d23e18de0c96fc879a55b0038f3439b6445.tar.gz | |
- djm@cvs.openbsd.org 2010/09/22 05:01:30
[kex.c kex.h kexecdh.c kexecdhc.c kexecdhs.c readconf.c readconf.h]
[servconf.c servconf.h ssh_config.5 sshconnect2.c sshd.c sshd_config.5]
add a KexAlgorithms knob to the client and server configuration to allow
selection of which key exchange methods are used by ssh(1) and sshd(8)
and their order of preference.
ok markus@
Diffstat (limited to 'servconf.h')
| -rw-r--r-- | servconf.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.93 2010/05/07 11:30:30 djm Exp $ */ +/* $OpenBSD: servconf.h,v 1.94 2010/09/22 05:01:29 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -72,6 +72,7 @@ typedef struct { int tcp_keep_alive; /* If true, set SO_KEEPALIVE. */ char *ciphers; /* Supported SSH2 ciphers. */ char *macs; /* Supported SSH2 macs. */ + char *kex_algorithms; /* SSH2 kex methods in order of preference. */ int protocol; /* Supported protocol versions. */ int gateway_ports; /* If true, allow remote connects to forwarded ports. */ SyslogFacility log_facility; /* Facility for system logging. */ |