diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /myproposal.h | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
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 7bca3bcae..98f27fd15 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.23 2009/01/23 07:58:11 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.24 2010/02/26 20:29:54 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -40,7 +40,9 @@ | |||
40 | "diffie-hellman-group1-sha1" | 40 | "diffie-hellman-group1-sha1" |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" | 43 | #define KEX_DEFAULT_PK_ALG "ssh-rsa-cert-v00@openssh.com," \ |
44 | "ssh-dss-cert-v00@openssh.com," \ | ||
45 | "ssh-rsa,ssh-dss" | ||
44 | 46 | ||
45 | #define KEX_DEFAULT_ENCRYPT \ | 47 | #define KEX_DEFAULT_ENCRYPT \ |
46 | "aes128-ctr,aes192-ctr,aes256-ctr," \ | 48 | "aes128-ctr,aes192-ctr,aes256-ctr," \ |