diff options
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/myproposal.h b/myproposal.h index 7bedfab0a..71f90ee5e 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.25 2010/04/16 01:47:26 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.26 2010/08/31 11:54:45 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -32,20 +32,38 @@ | |||
32 | "diffie-hellman-group-exchange-sha1," \ | 32 | "diffie-hellman-group-exchange-sha1," \ |
33 | "diffie-hellman-group14-sha1," \ | 33 | "diffie-hellman-group14-sha1," \ |
34 | "diffie-hellman-group1-sha1" | 34 | "diffie-hellman-group1-sha1" |
35 | |||
36 | #define KEX_DEFAULT_PK_ALG \ | ||
37 | "ssh-rsa-cert-v01@openssh.com," \ | ||
38 | "ssh-dss-cert-v01@openssh.com," \ | ||
39 | "ssh-rsa-cert-v00@openssh.com," \ | ||
40 | "ssh-dss-cert-v00@openssh.com," \ | ||
41 | "ssh-rsa," \ | ||
42 | "ssh-dss" | ||
35 | #else | 43 | #else |
36 | # define KEX_DEFAULT_KEX \ | 44 | # define KEX_DEFAULT_KEX \ |
45 | "ecdh-sha2-nistp521," \ | ||
46 | "ecdh-sha2-nistp256," \ | ||
47 | "ecdh-sha2-nistp384," \ | ||
37 | "diffie-hellman-group-exchange-sha256," \ | 48 | "diffie-hellman-group-exchange-sha256," \ |
38 | "diffie-hellman-group-exchange-sha1," \ | 49 | "diffie-hellman-group-exchange-sha1," \ |
39 | "diffie-hellman-group14-sha1," \ | 50 | "diffie-hellman-group14-sha1," \ |
40 | "diffie-hellman-group1-sha1" | 51 | "diffie-hellman-group1-sha1" |
41 | #endif | ||
42 | 52 | ||
43 | #define KEX_DEFAULT_PK_ALG \ | 53 | #define KEX_DEFAULT_PK_ALG \ |
44 | "ssh-rsa-cert-v01@openssh.com," \ | 54 | "ecdsa-sha2-nistp256-cert-v01@openssh.com," \ |
45 | "ssh-dss-cert-v01@openssh.com," \ | 55 | "ecdsa-sha2-nistp384-cert-v01@openssh.com," \ |
46 | "ssh-rsa-cert-v00@openssh.com," \ | 56 | "ecdsa-sha2-nistp521-cert-v01@openssh.com," \ |
47 | "ssh-dss-cert-v00@openssh.com," \ | 57 | "ssh-rsa-cert-v01@openssh.com," \ |
48 | "ssh-rsa,ssh-dss" | 58 | "ssh-dss-cert-v01@openssh.com," \ |
59 | "ssh-rsa-cert-v00@openssh.com," \ | ||
60 | "ssh-dss-cert-v00@openssh.com," \ | ||
61 | "ecdsa-sha2-nistp256," \ | ||
62 | "ecdsa-sha2-nistp384," \ | ||
63 | "ecdsa-sha2-nistp521," \ | ||
64 | "ssh-rsa," \ | ||
65 | "ssh-dss" | ||
66 | #endif | ||
49 | 67 | ||
50 | #define KEX_DEFAULT_ENCRYPT \ | 68 | #define KEX_DEFAULT_ENCRYPT \ |
51 | "aes128-ctr,aes192-ctr,aes256-ctr," \ | 69 | "aes128-ctr,aes192-ctr,aes256-ctr," \ |