diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:18:28 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:18:28 +0000 |
commit | 9a975a9faed7c4f334e8c8490db3e77e102f2b21 (patch) | |
tree | 764a885ec9a963f6a8b15de6e1765f16b9ac4738 /myproposal.h | |
parent | ee196dab7c5f97f0b80c8099343a375bead92010 (diff) | |
parent | cdb6c90811caa5df2df856be9b0b16db020fe31d (diff) |
Import openssh_6.5p1.orig.tar.gz
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h index 4e913e3ce..3a0f5aeab 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.32 2013/01/08 18:49:04 markus Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.35 2013/12/06 13:39:49 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -29,6 +29,7 @@ | |||
29 | /* conditional algorithm support */ | 29 | /* conditional algorithm support */ |
30 | 30 | ||
31 | #ifdef OPENSSL_HAS_ECC | 31 | #ifdef OPENSSL_HAS_ECC |
32 | #ifdef OPENSSL_HAS_NISTP521 | ||
32 | # define KEX_ECDH_METHODS \ | 33 | # define KEX_ECDH_METHODS \ |
33 | "ecdh-sha2-nistp256," \ | 34 | "ecdh-sha2-nistp256," \ |
34 | "ecdh-sha2-nistp384," \ | 35 | "ecdh-sha2-nistp384," \ |
@@ -42,6 +43,17 @@ | |||
42 | "ecdsa-sha2-nistp384," \ | 43 | "ecdsa-sha2-nistp384," \ |
43 | "ecdsa-sha2-nistp521," | 44 | "ecdsa-sha2-nistp521," |
44 | #else | 45 | #else |
46 | # define KEX_ECDH_METHODS \ | ||
47 | "ecdh-sha2-nistp256," \ | ||
48 | "ecdh-sha2-nistp384," | ||
49 | # define HOSTKEY_ECDSA_CERT_METHODS \ | ||
50 | "ecdsa-sha2-nistp256-cert-v01@openssh.com," \ | ||
51 | "ecdsa-sha2-nistp384-cert-v01@openssh.com," | ||
52 | # define HOSTKEY_ECDSA_METHODS \ | ||
53 | "ecdsa-sha2-nistp256," \ | ||
54 | "ecdsa-sha2-nistp384," | ||
55 | #endif | ||
56 | #else | ||
45 | # define KEX_ECDH_METHODS | 57 | # define KEX_ECDH_METHODS |
46 | # define HOSTKEY_ECDSA_CERT_METHODS | 58 | # define HOSTKEY_ECDSA_CERT_METHODS |
47 | # define HOSTKEY_ECDSA_METHODS | 59 | # define HOSTKEY_ECDSA_METHODS |
@@ -57,15 +69,19 @@ | |||
57 | #ifdef HAVE_EVP_SHA256 | 69 | #ifdef HAVE_EVP_SHA256 |
58 | # define KEX_SHA256_METHODS \ | 70 | # define KEX_SHA256_METHODS \ |
59 | "diffie-hellman-group-exchange-sha256," | 71 | "diffie-hellman-group-exchange-sha256," |
72 | #define KEX_CURVE25519_METHODS \ | ||
73 | "curve25519-sha256@libssh.org," | ||
60 | #define SHA2_HMAC_MODES \ | 74 | #define SHA2_HMAC_MODES \ |
61 | "hmac-sha2-256," \ | 75 | "hmac-sha2-256," \ |
62 | "hmac-sha2-512," | 76 | "hmac-sha2-512," |
63 | #else | 77 | #else |
64 | # define KEX_SHA256_METHODS | 78 | # define KEX_SHA256_METHODS |
79 | # define KEX_CURVE25519_METHODS | ||
65 | # define SHA2_HMAC_MODES | 80 | # define SHA2_HMAC_MODES |
66 | #endif | 81 | #endif |
67 | 82 | ||
68 | # define KEX_DEFAULT_KEX \ | 83 | # define KEX_DEFAULT_KEX \ |
84 | KEX_CURVE25519_METHODS \ | ||
69 | KEX_ECDH_METHODS \ | 85 | KEX_ECDH_METHODS \ |
70 | KEX_SHA256_METHODS \ | 86 | KEX_SHA256_METHODS \ |
71 | "diffie-hellman-group-exchange-sha1," \ | 87 | "diffie-hellman-group-exchange-sha1," \ |
@@ -74,11 +90,13 @@ | |||
74 | 90 | ||
75 | #define KEX_DEFAULT_PK_ALG \ | 91 | #define KEX_DEFAULT_PK_ALG \ |
76 | HOSTKEY_ECDSA_CERT_METHODS \ | 92 | HOSTKEY_ECDSA_CERT_METHODS \ |
93 | "ssh-ed25519-cert-v01@openssh.com," \ | ||
77 | "ssh-rsa-cert-v01@openssh.com," \ | 94 | "ssh-rsa-cert-v01@openssh.com," \ |
78 | "ssh-dss-cert-v01@openssh.com," \ | 95 | "ssh-dss-cert-v01@openssh.com," \ |
79 | "ssh-rsa-cert-v00@openssh.com," \ | 96 | "ssh-rsa-cert-v00@openssh.com," \ |
80 | "ssh-dss-cert-v00@openssh.com," \ | 97 | "ssh-dss-cert-v00@openssh.com," \ |
81 | HOSTKEY_ECDSA_METHODS \ | 98 | HOSTKEY_ECDSA_METHODS \ |
99 | "ssh-ed25519," \ | ||
82 | "ssh-rsa," \ | 100 | "ssh-rsa," \ |
83 | "ssh-dss" | 101 | "ssh-dss" |
84 | 102 | ||
@@ -88,6 +106,7 @@ | |||
88 | "aes128-ctr,aes192-ctr,aes256-ctr," \ | 106 | "aes128-ctr,aes192-ctr,aes256-ctr," \ |
89 | "arcfour256,arcfour128," \ | 107 | "arcfour256,arcfour128," \ |
90 | AESGCM_CIPHER_MODES \ | 108 | AESGCM_CIPHER_MODES \ |
109 | "chacha20-poly1305@openssh.com," \ | ||
91 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ | 110 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ |
92 | "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" | 111 | "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" |
93 | 112 | ||