diff options
-rw-r--r-- | myproposal.h | 5 | ||||
-rw-r--r-- | ssh_config.5 | 7 | ||||
-rw-r--r-- | sshd.c | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/myproposal.h b/myproposal.h index f0b9caa55..371f27cae 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.45 2015/07/03 03:43:18 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.46 2015/07/03 03:47:00 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -93,8 +93,7 @@ | |||
93 | 93 | ||
94 | #define KEX_CLIENT_KEX KEX_COMMON_KEX \ | 94 | #define KEX_CLIENT_KEX KEX_COMMON_KEX \ |
95 | "diffie-hellman-group-exchange-sha1," \ | 95 | "diffie-hellman-group-exchange-sha1," \ |
96 | "diffie-hellman-group14-sha1," \ | 96 | "diffie-hellman-group14-sha1" |
97 | "diffie-hellman-group1-sha1" | ||
98 | 97 | ||
99 | #define KEX_DEFAULT_PK_ALG \ | 98 | #define KEX_DEFAULT_PK_ALG \ |
100 | HOSTKEY_ECDSA_CERT_METHODS \ | 99 | HOSTKEY_ECDSA_CERT_METHODS \ |
diff --git a/ssh_config.5 b/ssh_config.5 index 268a627b2..d29963c15 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.211 2015/06/02 09:10:40 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.212 2015/07/03 03:47:00 djm Exp $ |
37 | .Dd $Mdocdate: June 2 2015 $ | 37 | .Dd $Mdocdate: July 3 2015 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -980,8 +980,7 @@ curve25519-sha256@libssh.org, | |||
980 | ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, | 980 | ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, |
981 | diffie-hellman-group-exchange-sha256, | 981 | diffie-hellman-group-exchange-sha256, |
982 | diffie-hellman-group-exchange-sha1, | 982 | diffie-hellman-group-exchange-sha1, |
983 | diffie-hellman-group14-sha1, | 983 | diffie-hellman-group14-sha1 |
984 | diffie-hellman-group1-sha1 | ||
985 | .Ed | 984 | .Ed |
986 | .Pp | 985 | .Pp |
987 | The list of available key exchange algorithms may also be obtained using the | 986 | The list of available key exchange algorithms may also be obtained using the |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.451 2015/07/03 03:43:18 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.452 2015/07/03 03:47:00 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2523,9 +2523,7 @@ sshd_hostkey_sign(Key *privkey, Key *pubkey, u_char **signature, size_t *slen, | |||
2523 | return 0; | 2523 | return 0; |
2524 | } | 2524 | } |
2525 | 2525 | ||
2526 | /* | 2526 | /* SSH2 key exchange */ |
2527 | * SSH2 key exchange: diffie-hellman-group1-sha1 | ||
2528 | */ | ||
2529 | static void | 2527 | static void |
2530 | do_ssh2_kex(void) | 2528 | do_ssh2_kex(void) |
2531 | { | 2529 | { |