diff options
| author | des <des@FreeBSD.org> | 2016-01-20 22:57:10 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-20 22:57:10 +0000 |
| commit | 9b2207f86007504b58fbb42ce7f30946bbd50cea (patch) | |
| tree | c90d6531b4082060e49583793ca124b381f7ffd6 /crypto/openssh/myproposal.h | |
| parent | e86fa364ca07e2714edcfb3790ae4ea2b1d460c9 (diff) | |
| download | FreeBSD-src-9b2207f86007504b58fbb42ce7f30946bbd50cea.zip FreeBSD-src-9b2207f86007504b58fbb42ce7f30946bbd50cea.tar.gz | |
Upgrade to OpenSSH 7.0p1.
Diffstat (limited to 'crypto/openssh/myproposal.h')
| -rw-r--r-- | crypto/openssh/myproposal.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/crypto/openssh/myproposal.h b/crypto/openssh/myproposal.h index 84b63bc..46e5b98 100644 --- a/crypto/openssh/myproposal.h +++ b/crypto/openssh/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.44 2015/05/27 23:51:10 dtucker Exp $ */ +/* $OpenBSD: myproposal.h,v 1.47 2015/07/10 06:21:53 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -93,20 +93,15 @@ #define KEX_CLIENT_KEX KEX_COMMON_KEX \ "diffie-hellman-group-exchange-sha1," \ - "diffie-hellman-group14-sha1," \ - "diffie-hellman-group1-sha1" + "diffie-hellman-group14-sha1" #define KEX_DEFAULT_PK_ALG \ HOSTKEY_ECDSA_CERT_METHODS \ "ssh-ed25519-cert-v01@openssh.com," \ "ssh-rsa-cert-v01@openssh.com," \ - "ssh-dss-cert-v01@openssh.com," \ - "ssh-rsa-cert-v00@openssh.com," \ - "ssh-dss-cert-v00@openssh.com," \ HOSTKEY_ECDSA_METHODS \ "ssh-ed25519," \ - "ssh-rsa," \ - "ssh-dss" + "ssh-rsa" \ /* the actual algorithms */ |
