diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-09-22 21:15:41 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-09-24 05:39:37 +1000 |
| commit | b97739dc21570209ed9d4e7beee0c669ed23b097 (patch) | |
| tree | 483c2ebb8ee541e8563b4bc0f5f94b0d7e931758 /kex.h | |
| parent | de6a175a99d22444e10d19ad3fffef39bc3ee3bb (diff) | |
upstream commit
missing bit from previous commit
Upstream-ID: 438d5ed6338b28b46e822eb13eee448aca31df37
Diffstat (limited to 'kex.h')
| -rw-r--r-- | kex.h | 25 |
1 files changed, 13 insertions, 12 deletions
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: kex.h,v 1.78 2016/05/02 10:26:04 djm Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.79 2016/09/22 21:15:41 djm Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
| @@ -50,17 +50,18 @@ | |||
| 50 | 50 | ||
| 51 | #define KEX_COOKIE_LEN 16 | 51 | #define KEX_COOKIE_LEN 16 |
| 52 | 52 | ||
| 53 | #define KEX_DH1 "diffie-hellman-group1-sha1" | 53 | #define KEX_DH1 "diffie-hellman-group1-sha1" |
| 54 | #define KEX_DH14_SHA1 "diffie-hellman-group14-sha1" | 54 | #define KEX_DH14_SHA1 "diffie-hellman-group14-sha1" |
| 55 | #define KEX_DH14_SHA256 "diffie-hellman-group14-sha256" | 55 | #define KEX_DH14_SHA256 "diffie-hellman-group14-sha256" |
| 56 | #define KEX_DH16_SHA512 "diffie-hellman-group16-sha512" | 56 | #define KEX_DH16_SHA512 "diffie-hellman-group16-sha512" |
| 57 | #define KEX_DH18_SHA512 "diffie-hellman-group18-sha512" | 57 | #define KEX_DH18_SHA512 "diffie-hellman-group18-sha512" |
| 58 | #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" | 58 | #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" |
| 59 | #define KEX_DHGEX_SHA256 "diffie-hellman-group-exchange-sha256" | 59 | #define KEX_DHGEX_SHA256 "diffie-hellman-group-exchange-sha256" |
| 60 | #define KEX_ECDH_SHA2_NISTP256 "ecdh-sha2-nistp256" | 60 | #define KEX_ECDH_SHA2_NISTP256 "ecdh-sha2-nistp256" |
| 61 | #define KEX_ECDH_SHA2_NISTP384 "ecdh-sha2-nistp384" | 61 | #define KEX_ECDH_SHA2_NISTP384 "ecdh-sha2-nistp384" |
| 62 | #define KEX_ECDH_SHA2_NISTP521 "ecdh-sha2-nistp521" | 62 | #define KEX_ECDH_SHA2_NISTP521 "ecdh-sha2-nistp521" |
| 63 | #define KEX_CURVE25519_SHA256 "curve25519-sha256@libssh.org" | 63 | #define KEX_CURVE25519_SHA256 "curve25519-sha256" |
| 64 | #define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org" | ||
| 64 | 65 | ||
| 65 | #define COMP_NONE 0 | 66 | #define COMP_NONE 0 |
| 66 | #define COMP_ZLIB 1 | 67 | #define COMP_ZLIB 1 |