sf@openbsd.org | 168b46f | 2018-07-09 13:37:10 +0000 | [diff] [blame] | 1 | /* $OpenBSD: kex.c,v 1.141 2018/07/09 13:37:10 sf Exp $ */ |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 2 | /* |
Ben Lindstrom | 4469723 | 2001-07-04 03:32:30 +0000 | [diff] [blame] | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 4 | * |
| 5 | * Redistribution and use in source and binary forms, with or without |
| 6 | * modification, are permitted provided that the following conditions |
| 7 | * are met: |
| 8 | * 1. Redistributions of source code must retain the above copyright |
| 9 | * notice, this list of conditions and the following disclaimer. |
| 10 | * 2. Redistributions in binary form must reproduce the above copyright |
| 11 | * notice, this list of conditions and the following disclaimer in the |
| 12 | * documentation and/or other materials provided with the distribution. |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 13 | * |
| 14 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| 15 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| 16 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| 17 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| 18 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| 19 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 20 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 21 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 | */ |
| 25 | |
| 26 | #include "includes.h" |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 27 | |
Damien Miller | 8dbffe7 | 2006-08-05 11:02:17 +1000 | [diff] [blame] | 28 | |
Damien Miller | d783435 | 2006-08-05 12:39:39 +1000 | [diff] [blame] | 29 | #include <signal.h> |
Damien Miller | ded319c | 2006-09-01 15:38:36 +1000 | [diff] [blame] | 30 | #include <stdarg.h> |
Damien Miller | a7a73ee | 2006-08-05 11:37:59 +1000 | [diff] [blame] | 31 | #include <stdio.h> |
Damien Miller | e7a1e5c | 2006-08-05 11:34:19 +1000 | [diff] [blame] | 32 | #include <stdlib.h> |
Damien Miller | e3476ed | 2006-07-24 14:13:33 +1000 | [diff] [blame] | 33 | #include <string.h> |
| 34 | |
Damien Miller | 1f0311c | 2014-05-15 14:24:09 +1000 | [diff] [blame] | 35 | #ifdef WITH_OPENSSL |
Damien Miller | d783435 | 2006-08-05 12:39:39 +1000 | [diff] [blame] | 36 | #include <openssl/crypto.h> |
Damien Miller | bd5f2b7 | 2016-07-15 19:14:48 +1000 | [diff] [blame] | 37 | #include <openssl/dh.h> |
Damien Miller | 1f0311c | 2014-05-15 14:24:09 +1000 | [diff] [blame] | 38 | #endif |
Damien Miller | d783435 | 2006-08-05 12:39:39 +1000 | [diff] [blame] | 39 | |
Damien Miller | d783435 | 2006-08-05 12:39:39 +1000 | [diff] [blame] | 40 | #include "ssh2.h" |
Ben Lindstrom | 226cfa0 | 2001-01-22 05:34:40 +0000 | [diff] [blame] | 41 | #include "packet.h" |
| 42 | #include "compat.h" |
| 43 | #include "cipher.h" |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 44 | #include "sshkey.h" |
Damien Miller | d783435 | 2006-08-05 12:39:39 +1000 | [diff] [blame] | 45 | #include "kex.h" |
Ben Lindstrom | 226cfa0 | 2001-01-22 05:34:40 +0000 | [diff] [blame] | 46 | #include "log.h" |
Ben Lindstrom | 06b33aa | 2001-02-15 03:01:59 +0000 | [diff] [blame] | 47 | #include "mac.h" |
Ben Lindstrom | b9be60a | 2001-03-11 01:49:19 +0000 | [diff] [blame] | 48 | #include "match.h" |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 49 | #include "misc.h" |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 50 | #include "dispatch.h" |
Ben Lindstrom | 7a2073c | 2002-03-22 02:30:41 +0000 | [diff] [blame] | 51 | #include "monitor.h" |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 52 | |
| 53 | #include "ssherr.h" |
| 54 | #include "sshbuf.h" |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 55 | #include "digest.h" |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 56 | |
Ben Lindstrom | bba8121 | 2001-06-25 05:01:22 +0000 | [diff] [blame] | 57 | /* prototype */ |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 58 | static int kex_choose_conf(struct ssh *); |
markus@openbsd.org | 2ae666a | 2017-05-30 14:23:52 +0000 | [diff] [blame] | 59 | static int kex_input_newkeys(int, u_int32_t, struct ssh *); |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 60 | |
djm@openbsd.org | 9690b78 | 2015-08-21 23:57:48 +0000 | [diff] [blame] | 61 | static const char *proposal_names[PROPOSAL_MAX] = { |
| 62 | "KEX algorithms", |
| 63 | "host key algorithms", |
| 64 | "ciphers ctos", |
| 65 | "ciphers stoc", |
| 66 | "MACs ctos", |
| 67 | "MACs stoc", |
| 68 | "compression ctos", |
| 69 | "compression stoc", |
| 70 | "languages ctos", |
| 71 | "languages stoc", |
| 72 | }; |
| 73 | |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 74 | struct kexalg { |
| 75 | char *name; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 76 | u_int type; |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 77 | int ec_nid; |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 78 | int hash_alg; |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 79 | }; |
| 80 | static const struct kexalg kexalgs[] = { |
Damien Miller | 1f0311c | 2014-05-15 14:24:09 +1000 | [diff] [blame] | 81 | #ifdef WITH_OPENSSL |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 82 | { KEX_DH1, KEX_DH_GRP1_SHA1, 0, SSH_DIGEST_SHA1 }, |
djm@openbsd.org | 0e8eeec | 2016-05-02 10:26:04 +0000 | [diff] [blame] | 83 | { KEX_DH14_SHA1, KEX_DH_GRP14_SHA1, 0, SSH_DIGEST_SHA1 }, |
| 84 | { KEX_DH14_SHA256, KEX_DH_GRP14_SHA256, 0, SSH_DIGEST_SHA256 }, |
| 85 | { KEX_DH16_SHA512, KEX_DH_GRP16_SHA512, 0, SSH_DIGEST_SHA512 }, |
| 86 | { KEX_DH18_SHA512, KEX_DH_GRP18_SHA512, 0, SSH_DIGEST_SHA512 }, |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 87 | { KEX_DHGEX_SHA1, KEX_DH_GEX_SHA1, 0, SSH_DIGEST_SHA1 }, |
Darren Tucker | a75d247 | 2013-05-10 18:11:55 +1000 | [diff] [blame] | 88 | #ifdef HAVE_EVP_SHA256 |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 89 | { KEX_DHGEX_SHA256, KEX_DH_GEX_SHA256, 0, SSH_DIGEST_SHA256 }, |
Damien Miller | 1f0311c | 2014-05-15 14:24:09 +1000 | [diff] [blame] | 90 | #endif /* HAVE_EVP_SHA256 */ |
Darren Tucker | a75d247 | 2013-05-10 18:11:55 +1000 | [diff] [blame] | 91 | #ifdef OPENSSL_HAS_ECC |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 92 | { KEX_ECDH_SHA2_NISTP256, KEX_ECDH_SHA2, |
| 93 | NID_X9_62_prime256v1, SSH_DIGEST_SHA256 }, |
| 94 | { KEX_ECDH_SHA2_NISTP384, KEX_ECDH_SHA2, NID_secp384r1, |
| 95 | SSH_DIGEST_SHA384 }, |
Darren Tucker | 37bcef5 | 2013-11-09 18:39:25 +1100 | [diff] [blame] | 96 | # ifdef OPENSSL_HAS_NISTP521 |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 97 | { KEX_ECDH_SHA2_NISTP521, KEX_ECDH_SHA2, NID_secp521r1, |
| 98 | SSH_DIGEST_SHA512 }, |
Damien Miller | 1f0311c | 2014-05-15 14:24:09 +1000 | [diff] [blame] | 99 | # endif /* OPENSSL_HAS_NISTP521 */ |
| 100 | #endif /* OPENSSL_HAS_ECC */ |
Damien Miller | 1f0311c | 2014-05-15 14:24:09 +1000 | [diff] [blame] | 101 | #endif /* WITH_OPENSSL */ |
Damien Miller | 72ef7c1 | 2015-01-15 02:21:31 +1100 | [diff] [blame] | 102 | #if defined(HAVE_EVP_SHA256) || !defined(WITH_OPENSSL) |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 103 | { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 }, |
djm@openbsd.org | 0493766 | 2016-09-22 17:52:53 +0000 | [diff] [blame] | 104 | { KEX_CURVE25519_SHA256_OLD, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 }, |
Damien Miller | 72ef7c1 | 2015-01-15 02:21:31 +1100 | [diff] [blame] | 105 | #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */ |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 106 | { NULL, -1, -1, -1}, |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 107 | }; |
| 108 | |
| 109 | char * |
Damien Miller | 690d989 | 2013-11-08 12:16:49 +1100 | [diff] [blame] | 110 | kex_alg_list(char sep) |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 111 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 112 | char *ret = NULL, *tmp; |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 113 | size_t nlen, rlen = 0; |
| 114 | const struct kexalg *k; |
| 115 | |
| 116 | for (k = kexalgs; k->name != NULL; k++) { |
| 117 | if (ret != NULL) |
Damien Miller | 690d989 | 2013-11-08 12:16:49 +1100 | [diff] [blame] | 118 | ret[rlen++] = sep; |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 119 | nlen = strlen(k->name); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 120 | if ((tmp = realloc(ret, rlen + nlen + 2)) == NULL) { |
| 121 | free(ret); |
| 122 | return NULL; |
| 123 | } |
| 124 | ret = tmp; |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 125 | memcpy(ret + rlen, k->name, nlen + 1); |
| 126 | rlen += nlen; |
| 127 | } |
| 128 | return ret; |
| 129 | } |
| 130 | |
| 131 | static const struct kexalg * |
| 132 | kex_alg_by_name(const char *name) |
| 133 | { |
| 134 | const struct kexalg *k; |
| 135 | |
| 136 | for (k = kexalgs; k->name != NULL; k++) { |
| 137 | if (strcmp(k->name, name) == 0) |
| 138 | return k; |
| 139 | } |
| 140 | return NULL; |
| 141 | } |
| 142 | |
Damien Miller | d5f62bf | 2010-09-24 22:11:14 +1000 | [diff] [blame] | 143 | /* Validate KEX method name list */ |
| 144 | int |
| 145 | kex_names_valid(const char *names) |
| 146 | { |
| 147 | char *s, *cp, *p; |
| 148 | |
| 149 | if (names == NULL || strcmp(names, "") == 0) |
| 150 | return 0; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 151 | if ((s = cp = strdup(names)) == NULL) |
| 152 | return 0; |
Damien Miller | d5f62bf | 2010-09-24 22:11:14 +1000 | [diff] [blame] | 153 | for ((p = strsep(&cp, ",")); p && *p != '\0'; |
| 154 | (p = strsep(&cp, ","))) { |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 155 | if (kex_alg_by_name(p) == NULL) { |
Damien Miller | d5f62bf | 2010-09-24 22:11:14 +1000 | [diff] [blame] | 156 | error("Unsupported KEX algorithm \"%.100s\"", p); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 157 | free(s); |
Damien Miller | d5f62bf | 2010-09-24 22:11:14 +1000 | [diff] [blame] | 158 | return 0; |
| 159 | } |
| 160 | } |
| 161 | debug3("kex names ok: [%s]", names); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 162 | free(s); |
Damien Miller | d5f62bf | 2010-09-24 22:11:14 +1000 | [diff] [blame] | 163 | return 1; |
| 164 | } |
| 165 | |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 166 | /* |
| 167 | * Concatenate algorithm names, avoiding duplicates in the process. |
| 168 | * Caller must free returned string. |
| 169 | */ |
| 170 | char * |
| 171 | kex_names_cat(const char *a, const char *b) |
| 172 | { |
dtucker@openbsd.org | 5a06b9e | 2017-03-10 03:45:40 +0000 | [diff] [blame] | 173 | char *ret = NULL, *tmp = NULL, *cp, *p, *m; |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 174 | size_t len; |
| 175 | |
| 176 | if (a == NULL || *a == '\0') |
djm@openbsd.org | 312d2f2 | 2018-07-04 13:49:31 +0000 | [diff] [blame] | 177 | return strdup(b); |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 178 | if (b == NULL || *b == '\0') |
| 179 | return strdup(a); |
| 180 | if (strlen(b) > 1024*1024) |
| 181 | return NULL; |
| 182 | len = strlen(a) + strlen(b) + 2; |
| 183 | if ((tmp = cp = strdup(b)) == NULL || |
| 184 | (ret = calloc(1, len)) == NULL) { |
| 185 | free(tmp); |
| 186 | return NULL; |
| 187 | } |
| 188 | strlcpy(ret, a, len); |
| 189 | for ((p = strsep(&cp, ",")); p && *p != '\0'; (p = strsep(&cp, ","))) { |
dtucker@openbsd.org | 5a06b9e | 2017-03-10 03:45:40 +0000 | [diff] [blame] | 190 | if ((m = match_list(ret, p, NULL)) != NULL) { |
| 191 | free(m); |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 192 | continue; /* Algorithm already present */ |
dtucker@openbsd.org | 5a06b9e | 2017-03-10 03:45:40 +0000 | [diff] [blame] | 193 | } |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 194 | if (strlcat(ret, ",", len) >= len || |
| 195 | strlcat(ret, p, len) >= len) { |
| 196 | free(tmp); |
| 197 | free(ret); |
| 198 | return NULL; /* Shouldn't happen */ |
| 199 | } |
| 200 | } |
| 201 | free(tmp); |
| 202 | return ret; |
| 203 | } |
| 204 | |
| 205 | /* |
| 206 | * Assemble a list of algorithms from a default list and a string from a |
| 207 | * configuration file. The user-provided string may begin with '+' to |
djm@openbsd.org | 68bc8cf | 2017-02-03 23:01:19 +0000 | [diff] [blame] | 208 | * indicate that it should be appended to the default or '-' that the |
| 209 | * specified names should be removed. |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 210 | */ |
| 211 | int |
djm@openbsd.org | 312d2f2 | 2018-07-04 13:49:31 +0000 | [diff] [blame] | 212 | kex_assemble_names(char **listp, const char *def, const char *all) |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 213 | { |
djm@openbsd.org | 312d2f2 | 2018-07-04 13:49:31 +0000 | [diff] [blame] | 214 | char *cp, *tmp, *patterns; |
| 215 | char *list = NULL, *ret = NULL, *matching = NULL, *opatterns = NULL; |
| 216 | int r = SSH_ERR_INTERNAL_ERROR; |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 217 | |
djm@openbsd.org | 312d2f2 | 2018-07-04 13:49:31 +0000 | [diff] [blame] | 218 | if (listp == NULL || *listp == NULL || **listp == '\0') { |
| 219 | if ((*listp = strdup(def)) == NULL) |
| 220 | return SSH_ERR_ALLOC_FAIL; |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 221 | return 0; |
| 222 | } |
djm@openbsd.org | 312d2f2 | 2018-07-04 13:49:31 +0000 | [diff] [blame] | 223 | |
| 224 | list = *listp; |
| 225 | *listp = NULL; |
| 226 | if (*list == '+') { |
| 227 | /* Append names to default list */ |
| 228 | if ((tmp = kex_names_cat(def, list + 1)) == NULL) { |
| 229 | r = SSH_ERR_ALLOC_FAIL; |
| 230 | goto fail; |
| 231 | } |
| 232 | free(list); |
| 233 | list = tmp; |
| 234 | } else if (*list == '-') { |
| 235 | /* Remove names from default list */ |
| 236 | if ((*listp = match_filter_blacklist(def, list + 1)) == NULL) { |
| 237 | r = SSH_ERR_ALLOC_FAIL; |
| 238 | goto fail; |
| 239 | } |
| 240 | free(list); |
| 241 | /* filtering has already been done */ |
| 242 | return 0; |
| 243 | } else { |
| 244 | /* Explicit list, overrides default - just use "list" as is */ |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 245 | } |
| 246 | |
djm@openbsd.org | 312d2f2 | 2018-07-04 13:49:31 +0000 | [diff] [blame] | 247 | /* |
| 248 | * The supplied names may be a pattern-list. For the -list case, |
| 249 | * the patterns are applied above. For the +list and explicit list |
| 250 | * cases we need to do it now. |
| 251 | */ |
| 252 | ret = NULL; |
| 253 | if ((patterns = opatterns = strdup(list)) == NULL) { |
| 254 | r = SSH_ERR_ALLOC_FAIL; |
| 255 | goto fail; |
| 256 | } |
| 257 | /* Apply positive (i.e. non-negated) patterns from the list */ |
| 258 | while ((cp = strsep(&patterns, ",")) != NULL) { |
| 259 | if (*cp == '!') { |
| 260 | /* negated matches are not supported here */ |
| 261 | r = SSH_ERR_INVALID_ARGUMENT; |
| 262 | goto fail; |
| 263 | } |
| 264 | free(matching); |
| 265 | if ((matching = match_filter_whitelist(all, cp)) == NULL) { |
| 266 | r = SSH_ERR_ALLOC_FAIL; |
| 267 | goto fail; |
| 268 | } |
| 269 | if ((tmp = kex_names_cat(ret, matching)) == NULL) { |
| 270 | r = SSH_ERR_ALLOC_FAIL; |
| 271 | goto fail; |
| 272 | } |
| 273 | free(ret); |
| 274 | ret = tmp; |
| 275 | } |
| 276 | if (ret == NULL || *ret == '\0') { |
| 277 | /* An empty name-list is an error */ |
| 278 | /* XXX better error code? */ |
| 279 | r = SSH_ERR_INVALID_ARGUMENT; |
| 280 | goto fail; |
| 281 | } |
| 282 | |
| 283 | /* success */ |
| 284 | *listp = ret; |
| 285 | ret = NULL; |
| 286 | r = 0; |
| 287 | |
| 288 | fail: |
| 289 | free(matching); |
| 290 | free(opatterns); |
| 291 | free(list); |
| 292 | free(ret); |
| 293 | return r; |
djm@openbsd.org | f9eca24 | 2015-07-30 00:01:34 +0000 | [diff] [blame] | 294 | } |
| 295 | |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 296 | /* put algorithm proposal into buffer */ |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 297 | int |
| 298 | kex_prop2buf(struct sshbuf *b, char *proposal[PROPOSAL_MAX]) |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 299 | { |
Damien Miller | eccb9de | 2005-06-17 12:59:34 +1000 | [diff] [blame] | 300 | u_int i; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 301 | int r; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 302 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 303 | sshbuf_reset(b); |
| 304 | |
Ben Lindstrom | 5997172 | 2002-03-27 17:42:57 +0000 | [diff] [blame] | 305 | /* |
| 306 | * add a dummy cookie, the cookie will be overwritten by |
| 307 | * kex_send_kexinit(), each time a kexinit is set |
| 308 | */ |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 309 | for (i = 0; i < KEX_COOKIE_LEN; i++) { |
| 310 | if ((r = sshbuf_put_u8(b, 0)) != 0) |
| 311 | return r; |
| 312 | } |
| 313 | for (i = 0; i < PROPOSAL_MAX; i++) { |
| 314 | if ((r = sshbuf_put_cstring(b, proposal[i])) != 0) |
| 315 | return r; |
| 316 | } |
| 317 | if ((r = sshbuf_put_u8(b, 0)) != 0 || /* first_kex_packet_follows */ |
| 318 | (r = sshbuf_put_u32(b, 0)) != 0) /* uint32 reserved */ |
| 319 | return r; |
| 320 | return 0; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 321 | } |
| 322 | |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 323 | /* parse buffer and return algorithm proposal */ |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 324 | int |
| 325 | kex_buf2prop(struct sshbuf *raw, int *first_kex_follows, char ***propp) |
Damien Miller | b1715dc | 2000-05-30 13:44:51 +1000 | [diff] [blame] | 326 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 327 | struct sshbuf *b = NULL; |
| 328 | u_char v; |
Darren Tucker | 0d0d195 | 2007-06-05 18:23:28 +1000 | [diff] [blame] | 329 | u_int i; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 330 | char **proposal = NULL; |
| 331 | int r; |
Damien Miller | b1715dc | 2000-05-30 13:44:51 +1000 | [diff] [blame] | 332 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 333 | *propp = NULL; |
| 334 | if ((proposal = calloc(PROPOSAL_MAX, sizeof(char *))) == NULL) |
| 335 | return SSH_ERR_ALLOC_FAIL; |
| 336 | if ((b = sshbuf_fromb(raw)) == NULL) { |
| 337 | r = SSH_ERR_ALLOC_FAIL; |
| 338 | goto out; |
| 339 | } |
| 340 | if ((r = sshbuf_consume(b, KEX_COOKIE_LEN)) != 0) /* skip cookie */ |
| 341 | goto out; |
Damien Miller | b1715dc | 2000-05-30 13:44:51 +1000 | [diff] [blame] | 342 | /* extract kex init proposal strings */ |
| 343 | for (i = 0; i < PROPOSAL_MAX; i++) { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 344 | if ((r = sshbuf_get_cstring(b, &(proposal[i]), NULL)) != 0) |
| 345 | goto out; |
djm@openbsd.org | 9690b78 | 2015-08-21 23:57:48 +0000 | [diff] [blame] | 346 | debug2("%s: %s", proposal_names[i], proposal[i]); |
Damien Miller | b1715dc | 2000-05-30 13:44:51 +1000 | [diff] [blame] | 347 | } |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 348 | /* first kex follows / reserved */ |
djm@openbsd.org | 271df81 | 2015-12-13 22:42:23 +0000 | [diff] [blame] | 349 | if ((r = sshbuf_get_u8(b, &v)) != 0 || /* first_kex_follows */ |
| 350 | (r = sshbuf_get_u32(b, &i)) != 0) /* reserved */ |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 351 | goto out; |
Damien Miller | babb47a | 2003-02-24 11:53:32 +1100 | [diff] [blame] | 352 | if (first_kex_follows != NULL) |
djm@openbsd.org | 271df81 | 2015-12-13 22:42:23 +0000 | [diff] [blame] | 353 | *first_kex_follows = v; |
djm@openbsd.org | 9690b78 | 2015-08-21 23:57:48 +0000 | [diff] [blame] | 354 | debug2("first_kex_follows %d ", v); |
| 355 | debug2("reserved %u ", i); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 356 | r = 0; |
| 357 | *propp = proposal; |
| 358 | out: |
| 359 | if (r != 0 && proposal != NULL) |
| 360 | kex_prop_free(proposal); |
| 361 | sshbuf_free(b); |
| 362 | return r; |
Damien Miller | b1715dc | 2000-05-30 13:44:51 +1000 | [diff] [blame] | 363 | } |
| 364 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 365 | void |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 366 | kex_prop_free(char **proposal) |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 367 | { |
Damien Miller | eccb9de | 2005-06-17 12:59:34 +1000 | [diff] [blame] | 368 | u_int i; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 369 | |
djm@openbsd.org | 44a8e7c | 2015-04-17 13:25:52 +0000 | [diff] [blame] | 370 | if (proposal == NULL) |
| 371 | return; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 372 | for (i = 0; i < PROPOSAL_MAX; i++) |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 373 | free(proposal[i]); |
| 374 | free(proposal); |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 375 | } |
| 376 | |
Darren Tucker | 0d0d195 | 2007-06-05 18:23:28 +1000 | [diff] [blame] | 377 | /* ARGSUSED */ |
markus@openbsd.org | 3fdc88a | 2015-01-19 20:07:45 +0000 | [diff] [blame] | 378 | static int |
markus@openbsd.org | 2ae666a | 2017-05-30 14:23:52 +0000 | [diff] [blame] | 379 | kex_protocol_error(int type, u_int32_t seq, struct ssh *ssh) |
Damien Miller | 874d77b | 2000-10-14 16:23:11 +1100 | [diff] [blame] | 380 | { |
djm@openbsd.org | d87063d | 2015-11-13 04:39:35 +0000 | [diff] [blame] | 381 | int r; |
| 382 | |
| 383 | error("kex protocol error: type %d seq %u", type, seq); |
| 384 | if ((r = sshpkt_start(ssh, SSH2_MSG_UNIMPLEMENTED)) != 0 || |
| 385 | (r = sshpkt_put_u32(ssh, seq)) != 0 || |
| 386 | (r = sshpkt_send(ssh)) != 0) |
| 387 | return r; |
markus@openbsd.org | 3fdc88a | 2015-01-19 20:07:45 +0000 | [diff] [blame] | 388 | return 0; |
Damien Miller | 874d77b | 2000-10-14 16:23:11 +1100 | [diff] [blame] | 389 | } |
| 390 | |
Ben Lindstrom | bba8121 | 2001-06-25 05:01:22 +0000 | [diff] [blame] | 391 | static void |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 392 | kex_reset_dispatch(struct ssh *ssh) |
Ben Lindstrom | 8ac9106 | 2001-04-04 17:57:54 +0000 | [diff] [blame] | 393 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 394 | ssh_dispatch_range(ssh, SSH2_MSG_TRANSPORT_MIN, |
Damien Miller | 7d05339 | 2002-01-22 23:24:13 +1100 | [diff] [blame] | 395 | SSH2_MSG_TRANSPORT_MAX, &kex_protocol_error); |
Ben Lindstrom | 8ac9106 | 2001-04-04 17:57:54 +0000 | [diff] [blame] | 396 | } |
| 397 | |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 398 | static int |
| 399 | kex_send_ext_info(struct ssh *ssh) |
| 400 | { |
| 401 | int r; |
djm@openbsd.org | 130f5df | 2016-09-12 23:31:27 +0000 | [diff] [blame] | 402 | char *algs; |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 403 | |
djm@openbsd.org | 183ba55 | 2017-03-10 04:07:20 +0000 | [diff] [blame] | 404 | if ((algs = sshkey_alg_list(0, 1, 1, ',')) == NULL) |
djm@openbsd.org | 130f5df | 2016-09-12 23:31:27 +0000 | [diff] [blame] | 405 | return SSH_ERR_ALLOC_FAIL; |
djm@openbsd.org | 4ba0d54 | 2018-07-03 11:39:54 +0000 | [diff] [blame] | 406 | /* XXX filter algs list by allowed pubkey/hostbased types */ |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 407 | if ((r = sshpkt_start(ssh, SSH2_MSG_EXT_INFO)) != 0 || |
| 408 | (r = sshpkt_put_u32(ssh, 1)) != 0 || |
| 409 | (r = sshpkt_put_cstring(ssh, "server-sig-algs")) != 0 || |
djm@openbsd.org | 130f5df | 2016-09-12 23:31:27 +0000 | [diff] [blame] | 410 | (r = sshpkt_put_cstring(ssh, algs)) != 0 || |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 411 | (r = sshpkt_send(ssh)) != 0) |
djm@openbsd.org | 130f5df | 2016-09-12 23:31:27 +0000 | [diff] [blame] | 412 | goto out; |
| 413 | /* success */ |
| 414 | r = 0; |
| 415 | out: |
| 416 | free(algs); |
djm@openbsd.org | 1622649 | 2016-09-21 19:53:12 +0000 | [diff] [blame] | 417 | return r; |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 418 | } |
| 419 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 420 | int |
| 421 | kex_send_newkeys(struct ssh *ssh) |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 422 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 423 | int r; |
Ben Lindstrom | 238abf6 | 2001-04-04 17:52:53 +0000 | [diff] [blame] | 424 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 425 | kex_reset_dispatch(ssh); |
| 426 | if ((r = sshpkt_start(ssh, SSH2_MSG_NEWKEYS)) != 0 || |
| 427 | (r = sshpkt_send(ssh)) != 0) |
| 428 | return r; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 429 | debug("SSH2_MSG_NEWKEYS sent"); |
Ben Lindstrom | 064496f | 2002-12-23 02:04:22 +0000 | [diff] [blame] | 430 | debug("expecting SSH2_MSG_NEWKEYS"); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 431 | ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_input_newkeys); |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 432 | if (ssh->kex->ext_info_c) |
| 433 | if ((r = kex_send_ext_info(ssh)) != 0) |
| 434 | return r; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 435 | return 0; |
| 436 | } |
Ben Lindstrom | 5ba23b3 | 2001-04-05 02:05:21 +0000 | [diff] [blame] | 437 | |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 438 | int |
markus@openbsd.org | 2ae666a | 2017-05-30 14:23:52 +0000 | [diff] [blame] | 439 | kex_input_ext_info(int type, u_int32_t seq, struct ssh *ssh) |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 440 | { |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 441 | struct kex *kex = ssh->kex; |
| 442 | u_int32_t i, ninfo; |
djm@openbsd.org | 4ba0d54 | 2018-07-03 11:39:54 +0000 | [diff] [blame] | 443 | char *name; |
djm@openbsd.org | c948030 | 2017-06-13 12:13:59 +0000 | [diff] [blame] | 444 | u_char *val; |
| 445 | size_t vlen; |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 446 | int r; |
| 447 | |
| 448 | debug("SSH2_MSG_EXT_INFO received"); |
| 449 | ssh_dispatch_set(ssh, SSH2_MSG_EXT_INFO, &kex_protocol_error); |
| 450 | if ((r = sshpkt_get_u32(ssh, &ninfo)) != 0) |
| 451 | return r; |
| 452 | for (i = 0; i < ninfo; i++) { |
| 453 | if ((r = sshpkt_get_cstring(ssh, &name, NULL)) != 0) |
| 454 | return r; |
djm@openbsd.org | c948030 | 2017-06-13 12:13:59 +0000 | [diff] [blame] | 455 | if ((r = sshpkt_get_string(ssh, &val, &vlen)) != 0) { |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 456 | free(name); |
| 457 | return r; |
| 458 | } |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 459 | if (strcmp(name, "server-sig-algs") == 0) { |
djm@openbsd.org | c948030 | 2017-06-13 12:13:59 +0000 | [diff] [blame] | 460 | /* Ensure no \0 lurking in value */ |
| 461 | if (memchr(val, '\0', vlen) != NULL) { |
| 462 | error("%s: nul byte in %s", __func__, name); |
| 463 | return SSH_ERR_INVALID_FORMAT; |
| 464 | } |
| 465 | debug("%s: %s=<%s>", __func__, name, val); |
djm@openbsd.org | 4ba0d54 | 2018-07-03 11:39:54 +0000 | [diff] [blame] | 466 | kex->server_sig_algs = val; |
| 467 | val = NULL; |
djm@openbsd.org | c948030 | 2017-06-13 12:13:59 +0000 | [diff] [blame] | 468 | } else |
| 469 | debug("%s: %s (unrecognised)", __func__, name); |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 470 | free(name); |
| 471 | free(val); |
| 472 | } |
| 473 | return sshpkt_get_end(ssh); |
| 474 | } |
| 475 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 476 | static int |
markus@openbsd.org | 2ae666a | 2017-05-30 14:23:52 +0000 | [diff] [blame] | 477 | kex_input_newkeys(int type, u_int32_t seq, struct ssh *ssh) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 478 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 479 | struct kex *kex = ssh->kex; |
| 480 | int r; |
| 481 | |
| 482 | debug("SSH2_MSG_NEWKEYS received"); |
| 483 | ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error); |
markus@openbsd.org | 2adbe1e | 2017-03-15 07:07:39 +0000 | [diff] [blame] | 484 | ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, &kex_input_kexinit); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 485 | if ((r = sshpkt_get_end(ssh)) != 0) |
| 486 | return r; |
markus@openbsd.org | 28652bc | 2016-09-19 19:02:19 +0000 | [diff] [blame] | 487 | if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0) |
| 488 | return r; |
Ben Lindstrom | be2cc43 | 2001-04-04 23:46:07 +0000 | [diff] [blame] | 489 | kex->done = 1; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 490 | sshbuf_reset(kex->peer); |
| 491 | /* sshbuf_reset(kex->my); */ |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 492 | kex->flags &= ~KEX_INIT_SENT; |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 493 | free(kex->name); |
Ben Lindstrom | 5ba23b3 | 2001-04-05 02:05:21 +0000 | [diff] [blame] | 494 | kex->name = NULL; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 495 | return 0; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 496 | } |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 497 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 498 | int |
| 499 | kex_send_kexinit(struct ssh *ssh) |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 500 | { |
Ben Lindstrom | 5997172 | 2002-03-27 17:42:57 +0000 | [diff] [blame] | 501 | u_char *cookie; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 502 | struct kex *kex = ssh->kex; |
| 503 | int r; |
Ben Lindstrom | 5997172 | 2002-03-27 17:42:57 +0000 | [diff] [blame] | 504 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 505 | if (kex == NULL) |
| 506 | return SSH_ERR_INTERNAL_ERROR; |
| 507 | if (kex->flags & KEX_INIT_SENT) |
| 508 | return 0; |
Ben Lindstrom | be2cc43 | 2001-04-04 23:46:07 +0000 | [diff] [blame] | 509 | kex->done = 0; |
Ben Lindstrom | 5997172 | 2002-03-27 17:42:57 +0000 | [diff] [blame] | 510 | |
| 511 | /* generate a random cookie */ |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 512 | if (sshbuf_len(kex->my) < KEX_COOKIE_LEN) |
| 513 | return SSH_ERR_INVALID_FORMAT; |
| 514 | if ((cookie = sshbuf_mutable_ptr(kex->my)) == NULL) |
| 515 | return SSH_ERR_INTERNAL_ERROR; |
| 516 | arc4random_buf(cookie, KEX_COOKIE_LEN); |
| 517 | |
| 518 | if ((r = sshpkt_start(ssh, SSH2_MSG_KEXINIT)) != 0 || |
| 519 | (r = sshpkt_putb(ssh, kex->my)) != 0 || |
| 520 | (r = sshpkt_send(ssh)) != 0) |
| 521 | return r; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 522 | debug("SSH2_MSG_KEXINIT sent"); |
| 523 | kex->flags |= KEX_INIT_SENT; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 524 | return 0; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 525 | } |
| 526 | |
Darren Tucker | 0d0d195 | 2007-06-05 18:23:28 +1000 | [diff] [blame] | 527 | /* ARGSUSED */ |
markus@openbsd.org | 3fdc88a | 2015-01-19 20:07:45 +0000 | [diff] [blame] | 528 | int |
markus@openbsd.org | 2ae666a | 2017-05-30 14:23:52 +0000 | [diff] [blame] | 529 | kex_input_kexinit(int type, u_int32_t seq, struct ssh *ssh) |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 530 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 531 | struct kex *kex = ssh->kex; |
| 532 | const u_char *ptr; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 533 | u_int i; |
| 534 | size_t dlen; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 535 | int r; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 536 | |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 537 | debug("SSH2_MSG_KEXINIT received"); |
Ben Lindstrom | 8ac9106 | 2001-04-04 17:57:54 +0000 | [diff] [blame] | 538 | if (kex == NULL) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 539 | return SSH_ERR_INVALID_ARGUMENT; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 540 | |
markus@openbsd.org | ec165c3 | 2016-10-10 19:28:48 +0000 | [diff] [blame] | 541 | ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 542 | ptr = sshpkt_ptr(ssh, &dlen); |
| 543 | if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0) |
| 544 | return r; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 545 | |
Ben Lindstrom | 8e312f3 | 2001-04-04 23:50:21 +0000 | [diff] [blame] | 546 | /* discard packet */ |
| 547 | for (i = 0; i < KEX_COOKIE_LEN; i++) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 548 | if ((r = sshpkt_get_u8(ssh, NULL)) != 0) |
| 549 | return r; |
Ben Lindstrom | 8e312f3 | 2001-04-04 23:50:21 +0000 | [diff] [blame] | 550 | for (i = 0; i < PROPOSAL_MAX; i++) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 551 | if ((r = sshpkt_get_string(ssh, NULL, NULL)) != 0) |
| 552 | return r; |
Darren Tucker | ae608bd | 2012-09-06 21:19:51 +1000 | [diff] [blame] | 553 | /* |
| 554 | * XXX RFC4253 sec 7: "each side MAY guess" - currently no supported |
| 555 | * KEX method has the server move first, but a server might be using |
| 556 | * a custom method or one that we otherwise don't support. We should |
| 557 | * be prepared to remember first_kex_follows here so we can eat a |
| 558 | * packet later. |
| 559 | * XXX2 - RFC4253 is kind of ambiguous on what first_kex_follows means |
| 560 | * for cases where the server *doesn't* go first. I guess we should |
| 561 | * ignore it when it is set for these cases, which is what we do now. |
| 562 | */ |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 563 | if ((r = sshpkt_get_u8(ssh, NULL)) != 0 || /* first_kex_follows */ |
| 564 | (r = sshpkt_get_u32(ssh, NULL)) != 0 || /* reserved */ |
| 565 | (r = sshpkt_get_end(ssh)) != 0) |
| 566 | return r; |
Ben Lindstrom | 8e312f3 | 2001-04-04 23:50:21 +0000 | [diff] [blame] | 567 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 568 | if (!(kex->flags & KEX_INIT_SENT)) |
| 569 | if ((r = kex_send_kexinit(ssh)) != 0) |
| 570 | return r; |
| 571 | if ((r = kex_choose_conf(ssh)) != 0) |
| 572 | return r; |
| 573 | |
| 574 | if (kex->kex_type < KEX_MAX && kex->kex[kex->kex_type] != NULL) |
| 575 | return (kex->kex[kex->kex_type])(ssh); |
| 576 | |
| 577 | return SSH_ERR_INTERNAL_ERROR; |
| 578 | } |
| 579 | |
| 580 | int |
| 581 | kex_new(struct ssh *ssh, char *proposal[PROPOSAL_MAX], struct kex **kexp) |
| 582 | { |
| 583 | struct kex *kex; |
| 584 | int r; |
| 585 | |
| 586 | *kexp = NULL; |
| 587 | if ((kex = calloc(1, sizeof(*kex))) == NULL) |
| 588 | return SSH_ERR_ALLOC_FAIL; |
| 589 | if ((kex->peer = sshbuf_new()) == NULL || |
| 590 | (kex->my = sshbuf_new()) == NULL) { |
| 591 | r = SSH_ERR_ALLOC_FAIL; |
| 592 | goto out; |
| 593 | } |
| 594 | if ((r = kex_prop2buf(kex->my, proposal)) != 0) |
| 595 | goto out; |
| 596 | kex->done = 0; |
| 597 | kex_reset_dispatch(ssh); |
markus@openbsd.org | 2adbe1e | 2017-03-15 07:07:39 +0000 | [diff] [blame] | 598 | ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, &kex_input_kexinit); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 599 | r = 0; |
| 600 | *kexp = kex; |
| 601 | out: |
| 602 | if (r != 0) |
| 603 | kex_free(kex); |
| 604 | return r; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 605 | } |
| 606 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 607 | void |
| 608 | kex_free_newkeys(struct newkeys *newkeys) |
| 609 | { |
| 610 | if (newkeys == NULL) |
| 611 | return; |
| 612 | if (newkeys->enc.key) { |
| 613 | explicit_bzero(newkeys->enc.key, newkeys->enc.key_len); |
| 614 | free(newkeys->enc.key); |
| 615 | newkeys->enc.key = NULL; |
| 616 | } |
| 617 | if (newkeys->enc.iv) { |
djm@openbsd.org | 179c353 | 2015-10-13 00:21:27 +0000 | [diff] [blame] | 618 | explicit_bzero(newkeys->enc.iv, newkeys->enc.iv_len); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 619 | free(newkeys->enc.iv); |
| 620 | newkeys->enc.iv = NULL; |
| 621 | } |
| 622 | free(newkeys->enc.name); |
| 623 | explicit_bzero(&newkeys->enc, sizeof(newkeys->enc)); |
| 624 | free(newkeys->comp.name); |
| 625 | explicit_bzero(&newkeys->comp, sizeof(newkeys->comp)); |
| 626 | mac_clear(&newkeys->mac); |
| 627 | if (newkeys->mac.key) { |
| 628 | explicit_bzero(newkeys->mac.key, newkeys->mac.key_len); |
| 629 | free(newkeys->mac.key); |
| 630 | newkeys->mac.key = NULL; |
| 631 | } |
| 632 | free(newkeys->mac.name); |
| 633 | explicit_bzero(&newkeys->mac, sizeof(newkeys->mac)); |
| 634 | explicit_bzero(newkeys, sizeof(*newkeys)); |
| 635 | free(newkeys); |
| 636 | } |
| 637 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 638 | void |
| 639 | kex_free(struct kex *kex) |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 640 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 641 | u_int mode; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 642 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 643 | #ifdef WITH_OPENSSL |
jsing@openbsd.org | 7cd3163 | 2018-02-07 02:06:50 +0000 | [diff] [blame] | 644 | DH_free(kex->dh); |
Damien Miller | 4df590c | 2015-03-11 10:02:39 +1100 | [diff] [blame] | 645 | #ifdef OPENSSL_HAS_ECC |
jsing@openbsd.org | 7cd3163 | 2018-02-07 02:06:50 +0000 | [diff] [blame] | 646 | EC_KEY_free(kex->ec_client_key); |
Damien Miller | 4df590c | 2015-03-11 10:02:39 +1100 | [diff] [blame] | 647 | #endif /* OPENSSL_HAS_ECC */ |
| 648 | #endif /* WITH_OPENSSL */ |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 649 | for (mode = 0; mode < MODE_MAX; mode++) { |
| 650 | kex_free_newkeys(kex->newkeys[mode]); |
| 651 | kex->newkeys[mode] = NULL; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 652 | } |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 653 | sshbuf_free(kex->peer); |
| 654 | sshbuf_free(kex->my); |
| 655 | free(kex->session_id); |
| 656 | free(kex->client_version_string); |
| 657 | free(kex->server_version_string); |
djm@openbsd.org | f319912 | 2015-07-29 04:43:06 +0000 | [diff] [blame] | 658 | free(kex->failed_choice); |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 659 | free(kex->hostkey_alg); |
| 660 | free(kex->name); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 661 | free(kex); |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 662 | } |
| 663 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 664 | int |
| 665 | kex_setup(struct ssh *ssh, char *proposal[PROPOSAL_MAX]) |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 666 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 667 | int r; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 668 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 669 | if ((r = kex_new(ssh, proposal, &ssh->kex)) != 0) |
| 670 | return r; |
| 671 | if ((r = kex_send_kexinit(ssh)) != 0) { /* we start */ |
| 672 | kex_free(ssh->kex); |
| 673 | ssh->kex = NULL; |
| 674 | return r; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 675 | } |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 676 | return 0; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 677 | } |
| 678 | |
djm@openbsd.org | 19bcf2e | 2016-02-08 10:57:07 +0000 | [diff] [blame] | 679 | /* |
| 680 | * Request key re-exchange, returns 0 on success or a ssherr.h error |
| 681 | * code otherwise. Must not be called if KEX is incomplete or in-progress. |
| 682 | */ |
| 683 | int |
| 684 | kex_start_rekex(struct ssh *ssh) |
| 685 | { |
| 686 | if (ssh->kex == NULL) { |
| 687 | error("%s: no kex", __func__); |
| 688 | return SSH_ERR_INTERNAL_ERROR; |
| 689 | } |
| 690 | if (ssh->kex->done == 0) { |
| 691 | error("%s: requested twice", __func__); |
| 692 | return SSH_ERR_INTERNAL_ERROR; |
| 693 | } |
| 694 | ssh->kex->done = 0; |
| 695 | return kex_send_kexinit(ssh); |
| 696 | } |
| 697 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 698 | static int |
| 699 | choose_enc(struct sshenc *enc, char *client, char *server) |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 700 | { |
Ben Lindstrom | b9be60a | 2001-03-11 01:49:19 +0000 | [diff] [blame] | 701 | char *name = match_list(client, server, NULL); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 702 | |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 703 | if (name == NULL) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 704 | return SSH_ERR_NO_CIPHER_ALG_MATCH; |
dtucker@openbsd.org | 5a06b9e | 2017-03-10 03:45:40 +0000 | [diff] [blame] | 705 | if ((enc->cipher = cipher_by_name(name)) == NULL) { |
| 706 | free(name); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 707 | return SSH_ERR_INTERNAL_ERROR; |
dtucker@openbsd.org | 5a06b9e | 2017-03-10 03:45:40 +0000 | [diff] [blame] | 708 | } |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 709 | enc->name = name; |
| 710 | enc->enabled = 0; |
| 711 | enc->iv = NULL; |
Damien Miller | 1d75abf | 2013-01-09 16:12:19 +1100 | [diff] [blame] | 712 | enc->iv_len = cipher_ivlen(enc->cipher); |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 713 | enc->key = NULL; |
Damien Miller | 963f6b2 | 2002-02-19 15:21:23 +1100 | [diff] [blame] | 714 | enc->key_len = cipher_keylen(enc->cipher); |
| 715 | enc->block_size = cipher_blocksize(enc->cipher); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 716 | return 0; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 717 | } |
Damien Miller | 4f7becb | 2006-03-26 14:10:14 +1100 | [diff] [blame] | 718 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 719 | static int |
| 720 | choose_mac(struct ssh *ssh, struct sshmac *mac, char *client, char *server) |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 721 | { |
Ben Lindstrom | b9be60a | 2001-03-11 01:49:19 +0000 | [diff] [blame] | 722 | char *name = match_list(client, server, NULL); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 723 | |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 724 | if (name == NULL) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 725 | return SSH_ERR_NO_MAC_ALG_MATCH; |
dtucker@openbsd.org | 5a06b9e | 2017-03-10 03:45:40 +0000 | [diff] [blame] | 726 | if (mac_setup(mac, name) < 0) { |
| 727 | free(name); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 728 | return SSH_ERR_INTERNAL_ERROR; |
dtucker@openbsd.org | 5a06b9e | 2017-03-10 03:45:40 +0000 | [diff] [blame] | 729 | } |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 730 | mac->name = name; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 731 | mac->key = NULL; |
| 732 | mac->enabled = 0; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 733 | return 0; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 734 | } |
Damien Miller | 4f7becb | 2006-03-26 14:10:14 +1100 | [diff] [blame] | 735 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 736 | static int |
| 737 | choose_comp(struct sshcomp *comp, char *client, char *server) |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 738 | { |
Ben Lindstrom | b9be60a | 2001-03-11 01:49:19 +0000 | [diff] [blame] | 739 | char *name = match_list(client, server, NULL); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 740 | |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 741 | if (name == NULL) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 742 | return SSH_ERR_NO_COMPRESS_ALG_MATCH; |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 743 | if (strcmp(name, "zlib@openssh.com") == 0) { |
sf@openbsd.org | 168b46f | 2018-07-09 13:37:10 +0000 | [diff] [blame] | 744 | comp->type = COMP_DELAYED; |
| 745 | } else if (strcmp(name, "zlib") == 0) { |
sf@openbsd.org | ab39267 | 2018-07-06 09:06:14 +0000 | [diff] [blame] | 746 | comp->type = COMP_ZLIB; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 747 | } else if (strcmp(name, "none") == 0) { |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 748 | comp->type = COMP_NONE; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 749 | } else { |
dtucker@openbsd.org | 5a06b9e | 2017-03-10 03:45:40 +0000 | [diff] [blame] | 750 | free(name); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 751 | return SSH_ERR_INTERNAL_ERROR; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 752 | } |
| 753 | comp->name = name; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 754 | return 0; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 755 | } |
Damien Miller | 4f7becb | 2006-03-26 14:10:14 +1100 | [diff] [blame] | 756 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 757 | static int |
| 758 | choose_kex(struct kex *k, char *client, char *server) |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 759 | { |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 760 | const struct kexalg *kexalg; |
| 761 | |
Ben Lindstrom | b9be60a | 2001-03-11 01:49:19 +0000 | [diff] [blame] | 762 | k->name = match_list(client, server, NULL); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 763 | |
djm@openbsd.org | 9690b78 | 2015-08-21 23:57:48 +0000 | [diff] [blame] | 764 | debug("kex: algorithm: %s", k->name ? k->name : "(no match)"); |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 765 | if (k->name == NULL) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 766 | return SSH_ERR_NO_KEX_ALG_MATCH; |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 767 | if ((kexalg = kex_alg_by_name(k->name)) == NULL) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 768 | return SSH_ERR_INTERNAL_ERROR; |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 769 | k->kex_type = kexalg->type; |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 770 | k->hash_alg = kexalg->hash_alg; |
Damien Miller | ea11119 | 2013-04-23 19:24:32 +1000 | [diff] [blame] | 771 | k->ec_nid = kexalg->ec_nid; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 772 | return 0; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 773 | } |
Damien Miller | 19bb3a5 | 2005-11-05 15:19:35 +1100 | [diff] [blame] | 774 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 775 | static int |
| 776 | choose_hostkeyalg(struct kex *k, char *client, char *server) |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 777 | { |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 778 | k->hostkey_alg = match_list(client, server, NULL); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 779 | |
djm@openbsd.org | 9690b78 | 2015-08-21 23:57:48 +0000 | [diff] [blame] | 780 | debug("kex: host key algorithm: %s", |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 781 | k->hostkey_alg ? k->hostkey_alg : "(no match)"); |
| 782 | if (k->hostkey_alg == NULL) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 783 | return SSH_ERR_NO_HOSTKEY_ALG_MATCH; |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 784 | k->hostkey_type = sshkey_type_from_name(k->hostkey_alg); |
Damien Miller | 0bc1bd8 | 2000-11-13 22:57:25 +1100 | [diff] [blame] | 785 | if (k->hostkey_type == KEY_UNSPEC) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 786 | return SSH_ERR_INTERNAL_ERROR; |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 787 | k->hostkey_nid = sshkey_ecdsa_nid_from_name(k->hostkey_alg); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 788 | return 0; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 789 | } |
| 790 | |
Damien Miller | a8e06ce | 2003-11-21 23:48:55 +1100 | [diff] [blame] | 791 | static int |
Damien Miller | babb47a | 2003-02-24 11:53:32 +1100 | [diff] [blame] | 792 | proposals_match(char *my[PROPOSAL_MAX], char *peer[PROPOSAL_MAX]) |
| 793 | { |
| 794 | static int check[] = { |
| 795 | PROPOSAL_KEX_ALGS, PROPOSAL_SERVER_HOST_KEY_ALGS, -1 |
| 796 | }; |
| 797 | int *idx; |
| 798 | char *p; |
| 799 | |
| 800 | for (idx = &check[0]; *idx != -1; idx++) { |
| 801 | if ((p = strchr(my[*idx], ',')) != NULL) |
| 802 | *p = '\0'; |
| 803 | if ((p = strchr(peer[*idx], ',')) != NULL) |
| 804 | *p = '\0'; |
| 805 | if (strcmp(my[*idx], peer[*idx]) != 0) { |
| 806 | debug2("proposal mismatch: my %s peer %s", |
| 807 | my[*idx], peer[*idx]); |
| 808 | return (0); |
| 809 | } |
| 810 | } |
| 811 | debug2("proposals match"); |
| 812 | return (1); |
| 813 | } |
| 814 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 815 | static int |
| 816 | kex_choose_conf(struct ssh *ssh) |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 817 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 818 | struct kex *kex = ssh->kex; |
| 819 | struct newkeys *newkeys; |
| 820 | char **my = NULL, **peer = NULL; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 821 | char **cprop, **sprop; |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 822 | int nenc, nmac, ncomp; |
Damien Miller | 76eea4a | 2014-01-26 09:37:25 +1100 | [diff] [blame] | 823 | u_int mode, ctos, need, dh_need, authlen; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 824 | int r, first_kex_follows; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 825 | |
djm@openbsd.org | 9690b78 | 2015-08-21 23:57:48 +0000 | [diff] [blame] | 826 | debug2("local %s KEXINIT proposal", kex->server ? "server" : "client"); |
| 827 | if ((r = kex_buf2prop(kex->my, NULL, &my)) != 0) |
| 828 | goto out; |
| 829 | debug2("peer %s KEXINIT proposal", kex->server ? "client" : "server"); |
| 830 | if ((r = kex_buf2prop(kex->peer, &first_kex_follows, &peer)) != 0) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 831 | goto out; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 832 | |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 833 | if (kex->server) { |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 834 | cprop=peer; |
| 835 | sprop=my; |
| 836 | } else { |
| 837 | cprop=my; |
| 838 | sprop=peer; |
| 839 | } |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 840 | |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 841 | /* Check whether client supports ext_info_c */ |
| 842 | if (kex->server) { |
| 843 | char *ext; |
| 844 | |
| 845 | ext = match_list("ext-info-c", peer[PROPOSAL_KEX_ALGS], NULL); |
markus@openbsd.org | e5e8d91 | 2016-09-06 09:14:05 +0000 | [diff] [blame] | 846 | kex->ext_info_c = (ext != NULL); |
| 847 | free(ext); |
markus@openbsd.org | 76c9fbb | 2015-12-04 16:41:28 +0000 | [diff] [blame] | 848 | } |
| 849 | |
Ben Lindstrom | be2cc43 | 2001-04-04 23:46:07 +0000 | [diff] [blame] | 850 | /* Algorithm Negotiation */ |
djm@openbsd.org | 9690b78 | 2015-08-21 23:57:48 +0000 | [diff] [blame] | 851 | if ((r = choose_kex(kex, cprop[PROPOSAL_KEX_ALGS], |
| 852 | sprop[PROPOSAL_KEX_ALGS])) != 0) { |
| 853 | kex->failed_choice = peer[PROPOSAL_KEX_ALGS]; |
| 854 | peer[PROPOSAL_KEX_ALGS] = NULL; |
| 855 | goto out; |
| 856 | } |
| 857 | if ((r = choose_hostkeyalg(kex, cprop[PROPOSAL_SERVER_HOST_KEY_ALGS], |
| 858 | sprop[PROPOSAL_SERVER_HOST_KEY_ALGS])) != 0) { |
| 859 | kex->failed_choice = peer[PROPOSAL_SERVER_HOST_KEY_ALGS]; |
| 860 | peer[PROPOSAL_SERVER_HOST_KEY_ALGS] = NULL; |
| 861 | goto out; |
| 862 | } |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 863 | for (mode = 0; mode < MODE_MAX; mode++) { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 864 | if ((newkeys = calloc(1, sizeof(*newkeys))) == NULL) { |
| 865 | r = SSH_ERR_ALLOC_FAIL; |
| 866 | goto out; |
| 867 | } |
Ben Lindstrom | be2cc43 | 2001-04-04 23:46:07 +0000 | [diff] [blame] | 868 | kex->newkeys[mode] = newkeys; |
Darren Tucker | 0d0d195 | 2007-06-05 18:23:28 +1000 | [diff] [blame] | 869 | ctos = (!kex->server && mode == MODE_OUT) || |
| 870 | (kex->server && mode == MODE_IN); |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 871 | nenc = ctos ? PROPOSAL_ENC_ALGS_CTOS : PROPOSAL_ENC_ALGS_STOC; |
| 872 | nmac = ctos ? PROPOSAL_MAC_ALGS_CTOS : PROPOSAL_MAC_ALGS_STOC; |
| 873 | ncomp = ctos ? PROPOSAL_COMP_ALGS_CTOS : PROPOSAL_COMP_ALGS_STOC; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 874 | if ((r = choose_enc(&newkeys->enc, cprop[nenc], |
djm@openbsd.org | f319912 | 2015-07-29 04:43:06 +0000 | [diff] [blame] | 875 | sprop[nenc])) != 0) { |
| 876 | kex->failed_choice = peer[nenc]; |
| 877 | peer[nenc] = NULL; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 878 | goto out; |
djm@openbsd.org | f319912 | 2015-07-29 04:43:06 +0000 | [diff] [blame] | 879 | } |
Damien Miller | 1d75abf | 2013-01-09 16:12:19 +1100 | [diff] [blame] | 880 | authlen = cipher_authlen(newkeys->enc.cipher); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 881 | /* ignore mac for authenticated encryption */ |
| 882 | if (authlen == 0 && |
| 883 | (r = choose_mac(ssh, &newkeys->mac, cprop[nmac], |
djm@openbsd.org | f319912 | 2015-07-29 04:43:06 +0000 | [diff] [blame] | 884 | sprop[nmac])) != 0) { |
| 885 | kex->failed_choice = peer[nmac]; |
| 886 | peer[nmac] = NULL; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 887 | goto out; |
djm@openbsd.org | f319912 | 2015-07-29 04:43:06 +0000 | [diff] [blame] | 888 | } |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 889 | if ((r = choose_comp(&newkeys->comp, cprop[ncomp], |
djm@openbsd.org | f319912 | 2015-07-29 04:43:06 +0000 | [diff] [blame] | 890 | sprop[ncomp])) != 0) { |
| 891 | kex->failed_choice = peer[ncomp]; |
| 892 | peer[ncomp] = NULL; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 893 | goto out; |
djm@openbsd.org | f319912 | 2015-07-29 04:43:06 +0000 | [diff] [blame] | 894 | } |
djm@openbsd.org | 9690b78 | 2015-08-21 23:57:48 +0000 | [diff] [blame] | 895 | debug("kex: %s cipher: %s MAC: %s compression: %s", |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 896 | ctos ? "client->server" : "server->client", |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 897 | newkeys->enc.name, |
Damien Miller | 1d75abf | 2013-01-09 16:12:19 +1100 | [diff] [blame] | 898 | authlen == 0 ? newkeys->mac.name : "<implicit>", |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 899 | newkeys->comp.name); |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 900 | } |
Damien Miller | 76eea4a | 2014-01-26 09:37:25 +1100 | [diff] [blame] | 901 | need = dh_need = 0; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 902 | for (mode = 0; mode < MODE_MAX; mode++) { |
Ben Lindstrom | be2cc43 | 2001-04-04 23:46:07 +0000 | [diff] [blame] | 903 | newkeys = kex->newkeys[mode]; |
deraadt@openbsd.org | 9136ec1 | 2016-09-12 01:22:38 +0000 | [diff] [blame] | 904 | need = MAXIMUM(need, newkeys->enc.key_len); |
| 905 | need = MAXIMUM(need, newkeys->enc.block_size); |
| 906 | need = MAXIMUM(need, newkeys->enc.iv_len); |
| 907 | need = MAXIMUM(need, newkeys->mac.key_len); |
| 908 | dh_need = MAXIMUM(dh_need, cipher_seclen(newkeys->enc.cipher)); |
| 909 | dh_need = MAXIMUM(dh_need, newkeys->enc.block_size); |
| 910 | dh_need = MAXIMUM(dh_need, newkeys->enc.iv_len); |
| 911 | dh_need = MAXIMUM(dh_need, newkeys->mac.key_len); |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 912 | } |
Damien Miller | b1715dc | 2000-05-30 13:44:51 +1000 | [diff] [blame] | 913 | /* XXX need runden? */ |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 914 | kex->we_need = need; |
Damien Miller | 76eea4a | 2014-01-26 09:37:25 +1100 | [diff] [blame] | 915 | kex->dh_need = dh_need; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 916 | |
Damien Miller | babb47a | 2003-02-24 11:53:32 +1100 | [diff] [blame] | 917 | /* ignore the next message if the proposals do not match */ |
djm@openbsd.org | 14b5c63 | 2018-01-23 05:27:21 +0000 | [diff] [blame] | 918 | if (first_kex_follows && !proposals_match(my, peer)) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 919 | ssh->dispatch_skip_packets = 1; |
| 920 | r = 0; |
| 921 | out: |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 922 | kex_prop_free(my); |
| 923 | kex_prop_free(peer); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 924 | return r; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 925 | } |
| 926 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 927 | static int |
| 928 | derive_key(struct ssh *ssh, int id, u_int need, u_char *hash, u_int hashlen, |
| 929 | const struct sshbuf *shared_secret, u_char **keyp) |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 930 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 931 | struct kex *kex = ssh->kex; |
| 932 | struct ssh_digest_ctx *hashctx = NULL; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 933 | char c = id; |
Damien Miller | eccb9de | 2005-06-17 12:59:34 +1000 | [diff] [blame] | 934 | u_int have; |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 935 | size_t mdsz; |
Damien Miller | eccb9de | 2005-06-17 12:59:34 +1000 | [diff] [blame] | 936 | u_char *digest; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 937 | int r; |
Damien Miller | 46d38de | 2005-07-17 17:02:09 +1000 | [diff] [blame] | 938 | |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 939 | if ((mdsz = ssh_digest_bytes(kex->hash_alg)) == 0) |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 940 | return SSH_ERR_INVALID_ARGUMENT; |
deraadt@openbsd.org | 9136ec1 | 2016-09-12 01:22:38 +0000 | [diff] [blame] | 941 | if ((digest = calloc(1, ROUNDUP(need, mdsz))) == NULL) { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 942 | r = SSH_ERR_ALLOC_FAIL; |
| 943 | goto out; |
| 944 | } |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 945 | |
Ben Lindstrom | be2cc43 | 2001-04-04 23:46:07 +0000 | [diff] [blame] | 946 | /* K1 = HASH(K || H || "A" || session_id) */ |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 947 | if ((hashctx = ssh_digest_start(kex->hash_alg)) == NULL || |
| 948 | ssh_digest_update_buffer(hashctx, shared_secret) != 0 || |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 949 | ssh_digest_update(hashctx, hash, hashlen) != 0 || |
| 950 | ssh_digest_update(hashctx, &c, 1) != 0 || |
| 951 | ssh_digest_update(hashctx, kex->session_id, |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 952 | kex->session_id_len) != 0 || |
| 953 | ssh_digest_final(hashctx, digest, mdsz) != 0) { |
| 954 | r = SSH_ERR_LIBCRYPTO_ERROR; |
| 955 | goto out; |
| 956 | } |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 957 | ssh_digest_free(hashctx); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 958 | hashctx = NULL; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 959 | |
Ben Lindstrom | be2cc43 | 2001-04-04 23:46:07 +0000 | [diff] [blame] | 960 | /* |
| 961 | * expand key: |
| 962 | * Kn = HASH(K || H || K1 || K2 || ... || Kn-1) |
| 963 | * Key = K1 || K2 || ... || Kn |
| 964 | */ |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 965 | for (have = mdsz; need > have; have += mdsz) { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 966 | if ((hashctx = ssh_digest_start(kex->hash_alg)) == NULL || |
| 967 | ssh_digest_update_buffer(hashctx, shared_secret) != 0 || |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 968 | ssh_digest_update(hashctx, hash, hashlen) != 0 || |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 969 | ssh_digest_update(hashctx, digest, have) != 0 || |
| 970 | ssh_digest_final(hashctx, digest + have, mdsz) != 0) { |
| 971 | r = SSH_ERR_LIBCRYPTO_ERROR; |
| 972 | goto out; |
| 973 | } |
Damien Miller | b3051d0 | 2014-01-10 10:58:53 +1100 | [diff] [blame] | 974 | ssh_digest_free(hashctx); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 975 | hashctx = NULL; |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 976 | } |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 977 | #ifdef DEBUG_KEX |
| 978 | fprintf(stderr, "key '%c'== ", c); |
| 979 | dump_digest("key", digest, need); |
| 980 | #endif |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 981 | *keyp = digest; |
| 982 | digest = NULL; |
| 983 | r = 0; |
| 984 | out: |
mmcc@openbsd.org | d59ce08 | 2015-12-10 17:08:40 +0000 | [diff] [blame] | 985 | free(digest); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 986 | ssh_digest_free(hashctx); |
| 987 | return r; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 988 | } |
| 989 | |
Ben Lindstrom | b9be60a | 2001-03-11 01:49:19 +0000 | [diff] [blame] | 990 | #define NKEYS 6 |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 991 | int |
| 992 | kex_derive_keys(struct ssh *ssh, u_char *hash, u_int hashlen, |
| 993 | const struct sshbuf *shared_secret) |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 994 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 995 | struct kex *kex = ssh->kex; |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 996 | u_char *keys[NKEYS]; |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 997 | u_int i, j, mode, ctos; |
| 998 | int r; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 999 | |
Damien Miller | 19bb3a5 | 2005-11-05 15:19:35 +1100 | [diff] [blame] | 1000 | for (i = 0; i < NKEYS; i++) { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 1001 | if ((r = derive_key(ssh, 'A'+i, kex->we_need, hash, hashlen, |
| 1002 | shared_secret, &keys[i])) != 0) { |
| 1003 | for (j = 0; j < i; j++) |
| 1004 | free(keys[j]); |
| 1005 | return r; |
| 1006 | } |
Damien Miller | 19bb3a5 | 2005-11-05 15:19:35 +1100 | [diff] [blame] | 1007 | } |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 1008 | for (mode = 0; mode < MODE_MAX; mode++) { |
Damien Miller | 4f7becb | 2006-03-26 14:10:14 +1100 | [diff] [blame] | 1009 | ctos = (!kex->server && mode == MODE_OUT) || |
| 1010 | (kex->server && mode == MODE_IN); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1011 | kex->newkeys[mode]->enc.iv = keys[ctos ? 0 : 1]; |
| 1012 | kex->newkeys[mode]->enc.key = keys[ctos ? 2 : 3]; |
| 1013 | kex->newkeys[mode]->mac.key = keys[ctos ? 4 : 5]; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 1014 | } |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 1015 | return 0; |
Damien Miller | a664e87 | 2000-04-16 11:52:47 +1000 | [diff] [blame] | 1016 | } |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 1017 | |
Damien Miller | 1f0311c | 2014-05-15 14:24:09 +1000 | [diff] [blame] | 1018 | #ifdef WITH_OPENSSL |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 1019 | int |
| 1020 | kex_derive_keys_bn(struct ssh *ssh, u_char *hash, u_int hashlen, |
| 1021 | const BIGNUM *secret) |
Damien Miller | 91b580e | 2014-01-12 19:21:22 +1100 | [diff] [blame] | 1022 | { |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 1023 | struct sshbuf *shared_secret; |
| 1024 | int r; |
Damien Miller | 91b580e | 2014-01-12 19:21:22 +1100 | [diff] [blame] | 1025 | |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 1026 | if ((shared_secret = sshbuf_new()) == NULL) |
| 1027 | return SSH_ERR_ALLOC_FAIL; |
| 1028 | if ((r = sshbuf_put_bignum2(shared_secret, secret)) == 0) |
| 1029 | r = kex_derive_keys(ssh, hash, hashlen, shared_secret); |
| 1030 | sshbuf_free(shared_secret); |
| 1031 | return r; |
Damien Miller | 91b580e | 2014-01-12 19:21:22 +1100 | [diff] [blame] | 1032 | } |
Damien Miller | 1f0311c | 2014-05-15 14:24:09 +1000 | [diff] [blame] | 1033 | #endif |
Damien Miller | 91b580e | 2014-01-12 19:21:22 +1100 | [diff] [blame] | 1034 | |
Darren Tucker | e14e005 | 2004-05-13 16:30:44 +1000 | [diff] [blame] | 1035 | |
Damien Miller | eb8b60e | 2010-08-31 22:41:14 +1000 | [diff] [blame] | 1036 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) || defined(DEBUG_KEXECDH) |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 1037 | void |
| 1038 | dump_digest(char *msg, u_char *digest, int len) |
| 1039 | { |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 1040 | fprintf(stderr, "%s\n", msg); |
markus@openbsd.org | 57d10cb | 2015-01-19 20:16:15 +0000 | [diff] [blame] | 1041 | sshbuf_dump_data(digest, len, stderr); |
Ben Lindstrom | 20d7c7b | 2001-04-04 01:56:17 +0000 | [diff] [blame] | 1042 | } |
| 1043 | #endif |