commit bdfd29f60b74f3e678297269dc6247a5699583c1
author djm@openbsd.org <djm@openbsd.org> Fri Jul 03 03:47:00 2015 +0000
committer Damien Miller <djm@mindrot.org> Wed Jul 15 15:35:31 2015 +1000
tree f05bd48778749ef29b635a4c113c00e795ba4e7f
parent c28fc62d789d860c75e23a9fa9fb250eb2beca57

upstream commit

turn off 1024 bit diffie-hellman-group1-sha1 key
 exchange method (already off in server, this turns it off in the client by
 default too) ok dtucker@

Upstream-ID: f59b88f449210ab7acf7d9d88f20f1daee97a4fa

sshd.c

diff --git a/sshd.c b/sshd.c
index 15af4e8..8010500 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.451 2015/07/03 03:43:18 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.452 2015/07/03 03:47:00 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2523,9 +2523,7 @@
 	return 0;
 }
 
-/*
- * SSH2 key exchange: diffie-hellman-group1-sha1
- */
+/* SSH2 key exchange */
 static void
 do_ssh2_kex(void)
 {