diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2019-02-23 08:20:44 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2019-02-23 08:20:44 +0000 |
| commit | a2778ab23b430b9a8f975e9028e8bfafeadef273 (patch) | |
| tree | 48ea595678ba12ec3b3ed4128b9dd56477f573f5 /usr.bin/ssh/ssh_config.5 | |
| parent | 8d704d6114123c20946c4fc39355323dc77c5ad3 (diff) | |
openssh-7.9 accidentally reused the server's algorithm lists in the
client for KEX, ciphers and MACs. The ciphers and MACs were
identical between the client and server, but the error accidentially
disabled the diffie-hellman-group-exchange-sha1 KEX method.
This fixes the client code to use the correct method list, but
because nobody complained, it also disables the
diffie-hellman-group-exchange-sha1 KEX method.
Reported by nuxi AT vault24.org via bz#2697; ok dtucker
Diffstat (limited to 'usr.bin/ssh/ssh_config.5')
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index e648e5a468f..35c84432b70 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/ssh_config.5 @@ -33,8 +33,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_config.5,v 1.290 2019/02/18 07:02:34 jmc Exp $ -.Dd $Mdocdate: February 18 2019 $ +.\" $OpenBSD: ssh_config.5,v 1.291 2019/02/23 08:20:43 djm Exp $ +.Dd $Mdocdate: February 23 2019 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1059,7 +1059,6 @@ ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, diffie-hellman-group-exchange-sha256, diffie-hellman-group16-sha512, diffie-hellman-group18-sha512, -diffie-hellman-group-exchange-sha1, diffie-hellman-group14-sha256, diffie-hellman-group14-sha1 .Ed |