diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-07-03 03:47:00 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-07-15 15:35:31 +1000 |
commit | bdfd29f60b74f3e678297269dc6247a5699583c1 (patch) | |
tree | f05bd48778749ef29b635a4c113c00e795ba4e7f /myproposal.h | |
parent | c28fc62d789d860c75e23a9fa9fb250eb2beca57 (diff) |
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
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 5 |
1 files changed, 2 insertions, 3 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 \ |