diff options
| author | Damien Miller <djm@mindrot.org> | 2004-06-15 10:30:09 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2004-06-15 10:30:09 +1000 |
| commit | f675fc4948b2ec2c9ff86bcdd58e00947f0e319b (patch) | |
| tree | babb42f0a29e7b24284a731cb894454d8f80fc97 /myproposal.h | |
| parent | 7cf17eb78c71ba16ec39bb1a6a8640885071a307 (diff) | |
| download | openssh-git-f675fc4948b2ec2c9ff86bcdd58e00947f0e319b.tar.gz | |
- djm@cvs.openbsd.org 2004/06/13 12:53:24
[dh.c dh.h kex.c kex.h kexdhc.c kexdhs.c monitor.c myproposal.h]
[ssh-keyscan.c sshconnect2.c sshd.c]
implement diffie-hellman-group14-sha1 kex method (trivial extension to
existing diffie-hellman-group1-sha1); ok markus@
Diffstat (limited to 'myproposal.h')
| -rw-r--r-- | myproposal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/myproposal.h b/myproposal.h index 8b431d9d..228ed688 100644 --- a/myproposal.h +++ b/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.15 2003/05/17 04:27:52 markus Exp $ */ +/* $OpenBSD: myproposal.h,v 1.16 2004/06/13 12:53:24 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -23,7 +23,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1" +#define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1," \ + "diffie-hellman-group14-sha1," \ + "diffie-hellman-group1-sha1" #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" #define KEX_DEFAULT_ENCRYPT \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ |