diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2015-05-27 23:51:10 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-05-28 13:53:14 +1000 |
| commit | 3ecde664c9fc5fb3667aedf9e6671462600f6496 (patch) | |
| tree | da5d5c774bd23ab5d5e5984644487773e8e76170 | |
| parent | 40f64292b907afd0a674fdbf3e4c2356d17a7d68 (diff) | |
upstream commit
Reorder client proposal to prefer
diffie-hellman-group-exchange-sha1 over diffie-hellman-group14-sha1. ok djm@
Upstream-ID: 552c08d47347c3ee1a9a57d88441ab50abe17058
| -rw-r--r-- | myproposal.h | 13 | ||||
| -rw-r--r-- | ssh_config.5 | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/myproposal.h b/myproposal.h index c397553a..a3e444b2 100644 --- a/myproposal.h +++ b/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.43 2015/04/21 07:01:00 jsg Exp $ */ +/* $OpenBSD: myproposal.h,v 1.44 2015/05/27 23:51:10 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -83,14 +83,17 @@ # else # define KEX_CURVE25519_METHODS "" # endif -#define KEX_SERVER_KEX \ +#define KEX_COMMON_KEX \ KEX_CURVE25519_METHODS \ KEX_ECDH_METHODS \ - KEX_SHA256_METHODS \ - "diffie-hellman-group14-sha1" + KEX_SHA256_METHODS -#define KEX_CLIENT_KEX KEX_SERVER_KEX "," \ +#define KEX_SERVER_KEX KEX_COMMON_KEX "," \ + "diffie-hellman-group14-sha1" \ + +#define KEX_CLIENT_KEX KEX_COMMON_KEX "," \ "diffie-hellman-group-exchange-sha1," \ + "diffie-hellman-group14-sha1," \ "diffie-hellman-group1-sha1" #define KEX_DEFAULT_PK_ALG \ diff --git a/ssh_config.5 b/ssh_config.5 index 844556b5..5758eb81 100644 --- a/ssh_config.5 +++ b/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.208 2015/04/28 13:47:38 jmc Exp $ -.Dd $Mdocdate: April 28 2015 $ +.\" $OpenBSD: ssh_config.5,v 1.209 2015/05/27 23:51:10 dtucker Exp $ +.Dd $Mdocdate: May 27 2015 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -975,8 +975,8 @@ The default is: curve25519-sha256@libssh.org, ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, diffie-hellman-group-exchange-sha256, -diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1, +diffie-hellman-group14-sha1, diffie-hellman-group1-sha1 .Ed .Pp |