nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

transport2: make kexlists dynamically allocated.

Browse Source 
The list of kex methods recently ran out of space due to the addition
of NTRU (at least, if you have GSSAPI enabled). It's time to stop
having an arbitrary limit on those arrays and switch to doing it
properly.
This commit is contained in:
Simon Tatham 2022-04-21 05:11:58 +01:00
parent 6a9e4ba24a
commit 7d44e35bb3
2 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
ssh/transport2.c
View File

@ -216,6 +216,8 @@ static void ssh2_transport_free(PacketProtocolLayer *ppl)
ssh_key_free(s->hkey); ssh_key_free(s->hkey);
s->hkey = NULL; s->hkey = NULL;
} }
for (size_t i = 0; i < NKEXLIST; i++)
sfree(s->kexlists[i].algs);
if (s->f) mp_free(s->f); if (s->f) mp_free(s->f);
if (s->p) mp_free(s->p); if (s->p) mp_free(s->p);
if (s->g) mp_free(s->g); if (s->g) mp_free(s->g);
@ -307,21 +309,20 @@ static void ssh2_mkkey(
* of. * of.
*/ */
static struct kexinit_algorithm *ssh2_kexinit_addalg_pl( static struct kexinit_algorithm *ssh2_kexinit_addalg_pl(
struct kexinit_algorithm *list, ptrlen name) struct kexinit_algorithm_list *list, ptrlen name)
{ {
int i; for (size_t i = 0; i < list->nalgs; i++)
if (ptrlen_eq_ptrlen(list->algs[i].name, name))
return &list->algs[i];
for (i = 0; i < MAXKEXLIST; i++) sgrowarray(list->algs, list->algsize, list->nalgs);
if (list[i].name.ptr == NULL || ptrlen_eq_ptrlen(list[i].name, name)) { struct kexinit_algorithm *entry = &list->algs[list->nalgs++];
list[i].name = name; entry->name = name;
return &list[i]; return entry;
}
unreachable("Should never run out of space in KEXINIT list");
} }
static struct kexinit_algorithm *ssh2_kexinit_addalg( static struct kexinit_algorithm *ssh2_kexinit_addalg(
struct kexinit_algorithm *list, const char *name) struct kexinit_algorithm_list *list, const char *name)
{ {
return ssh2_kexinit_addalg_pl(list, ptrlen_from_asciz(name)); return ssh2_kexinit_addalg_pl(list, ptrlen_from_asciz(name));
} }
@ -489,7 +490,7 @@ PktIn *ssh2_transport_pop(struct ssh2_transport_state *s)
static void ssh2_write_kexinit_lists( static void ssh2_write_kexinit_lists(
BinarySink *pktout, BinarySink *pktout,
struct kexinit_algorithm kexlists[NKEXLIST][MAXKEXLIST], struct kexinit_algorithm_list kexlists[NKEXLIST],
Conf *conf, const SshServerConfig *ssc, int remote_bugs, Conf *conf, const SshServerConfig *ssc, int remote_bugs,
const char *hk_host, int hk_port, const ssh_keyalg *hk_prev, const char *hk_host, int hk_port, const ssh_keyalg *hk_prev,
ssh_transient_hostkey_cache *thc, ssh_transient_hostkey_cache *thc,
@ -611,15 +612,14 @@ static void ssh2_write_kexinit_lists(
preferred_comp = &ssh_comp_none; preferred_comp = &ssh_comp_none;
for (i = 0; i < NKEXLIST; i++) for (i = 0; i < NKEXLIST; i++)
for (j = 0; j < MAXKEXLIST; j++) kexlists[i].nalgs = 0;
kexlists[i][j].name = make_ptrlen(NULL, 0);
/* List key exchange algorithms. */ /* List key exchange algorithms. */
warn = false; warn = false;
for (i = 0; i < n_preferred_kex; i++) { for (i = 0; i < n_preferred_kex; i++) {
const ssh_kexes *k = preferred_kex[i]; const ssh_kexes *k = preferred_kex[i];
if (!k) warn = true; if (!k) warn = true;
else for (j = 0; j < k->nkexes; j++) { else for (j = 0; j < k->nkexes; j++) {
alg = ssh2_kexinit_addalg(kexlists[KEXLIST_KEX], alg = ssh2_kexinit_addalg(&kexlists[KEXLIST_KEX],
k->list[j]->name); k->list[j]->name);
alg->u.kex.kex = k->list[j]; alg->u.kex.kex = k->list[j];
alg->u.kex.warn = warn; alg->u.kex.warn = warn;
@ -634,20 +634,20 @@ static void ssh2_write_kexinit_lists(
for (i = 0; i < our_nhostkeys; i++) { for (i = 0; i < our_nhostkeys; i++) {
const ssh_keyalg *keyalg = ssh_key_alg(our_hostkeys[i]); const ssh_keyalg *keyalg = ssh_key_alg(our_hostkeys[i]);
alg = ssh2_kexinit_addalg(kexlists[KEXLIST_HOSTKEY], alg = ssh2_kexinit_addalg(&kexlists[KEXLIST_HOSTKEY],
keyalg->ssh_id); keyalg->ssh_id);
alg->u.hk.hostkey = keyalg; alg->u.hk.hostkey = keyalg;
alg->u.hk.hkflags = 0; alg->u.hk.hkflags = 0;
alg->u.hk.warn = false; alg->u.hk.warn = false;
if (keyalg == &ssh_rsa) { if (keyalg == &ssh_rsa) {
alg = ssh2_kexinit_addalg(kexlists[KEXLIST_HOSTKEY], alg = ssh2_kexinit_addalg(&kexlists[KEXLIST_HOSTKEY],
"rsa-sha2-256"); "rsa-sha2-256");
alg->u.hk.hostkey = keyalg; alg->u.hk.hostkey = keyalg;
alg->u.hk.hkflags = SSH_AGENT_RSA_SHA2_256; alg->u.hk.hkflags = SSH_AGENT_RSA_SHA2_256;
alg->u.hk.warn = false; alg->u.hk.warn = false;
alg = ssh2_kexinit_addalg(kexlists[KEXLIST_HOSTKEY], alg = ssh2_kexinit_addalg(&kexlists[KEXLIST_HOSTKEY],
"rsa-sha2-512"); "rsa-sha2-512");
alg->u.hk.hostkey = keyalg; alg->u.hk.hostkey = keyalg;
alg->u.hk.hkflags = SSH_AGENT_RSA_SHA2_512; alg->u.hk.hkflags = SSH_AGENT_RSA_SHA2_512;
@ -678,7 +678,7 @@ static void ssh2_write_kexinit_lists(
if (conf_get_bool(conf, CONF_ssh_prefer_known_hostkeys) && if (conf_get_bool(conf, CONF_ssh_prefer_known_hostkeys) &&
have_ssh_host_key(hk_host, hk_port, have_ssh_host_key(hk_host, hk_port,
ssh2_hostkey_algs[j].alg->cache_id)) { ssh2_hostkey_algs[j].alg->cache_id)) {
alg = ssh2_kexinit_addalg(kexlists[KEXLIST_HOSTKEY], alg = ssh2_kexinit_addalg(&kexlists[KEXLIST_HOSTKEY],
ssh2_hostkey_algs[j].alg->ssh_id); ssh2_hostkey_algs[j].alg->ssh_id);
alg->u.hk.hostkey = ssh2_hostkey_algs[j].alg; alg->u.hk.hostkey = ssh2_hostkey_algs[j].alg;
alg->u.hk.warn = warn; alg->u.hk.warn = warn;
@ -692,7 +692,7 @@ static void ssh2_write_kexinit_lists(
for (j = 0; j < lenof(ssh2_hostkey_algs); j++) { for (j = 0; j < lenof(ssh2_hostkey_algs); j++) {
if (ssh2_hostkey_algs[j].id != preferred_hk[i]) if (ssh2_hostkey_algs[j].id != preferred_hk[i])
continue; continue;
alg = ssh2_kexinit_addalg(kexlists[KEXLIST_HOSTKEY], alg = ssh2_kexinit_addalg(&kexlists[KEXLIST_HOSTKEY],
ssh2_hostkey_algs[j].alg->ssh_id); ssh2_hostkey_algs[j].alg->ssh_id);
alg->u.hk.hostkey = ssh2_hostkey_algs[j].alg; alg->u.hk.hostkey = ssh2_hostkey_algs[j].alg;
alg->u.hk.warn = warn; alg->u.hk.warn = warn;
@ -721,7 +721,7 @@ static void ssh2_write_kexinit_lists(
continue; continue;
if (ssh_transient_hostkey_cache_has( if (ssh_transient_hostkey_cache_has(
thc, ssh2_hostkey_algs[j].alg)) { thc, ssh2_hostkey_algs[j].alg)) {
alg = ssh2_kexinit_addalg(kexlists[KEXLIST_HOSTKEY], alg = ssh2_kexinit_addalg(&kexlists[KEXLIST_HOSTKEY],
ssh2_hostkey_algs[j].alg->ssh_id); ssh2_hostkey_algs[j].alg->ssh_id);
alg->u.hk.hostkey = ssh2_hostkey_algs[j].alg; alg->u.hk.hostkey = ssh2_hostkey_algs[j].alg;
alg->u.hk.warn = warn; alg->u.hk.warn = warn;
@ -738,19 +738,19 @@ static void ssh2_write_kexinit_lists(
* reverification. * reverification.
*/ */
assert(hk_prev); assert(hk_prev);
alg = ssh2_kexinit_addalg(kexlists[KEXLIST_HOSTKEY], hk_prev->ssh_id); alg = ssh2_kexinit_addalg(&kexlists[KEXLIST_HOSTKEY], hk_prev->ssh_id);
alg->u.hk.hostkey = hk_prev; alg->u.hk.hostkey = hk_prev;
alg->u.hk.warn = false; alg->u.hk.warn = false;
} }
if (can_gssapi_keyex) { if (can_gssapi_keyex) {
alg = ssh2_kexinit_addalg(kexlists[KEXLIST_HOSTKEY], "null"); alg = ssh2_kexinit_addalg(&kexlists[KEXLIST_HOSTKEY], "null");
alg->u.hk.hostkey = NULL; alg->u.hk.hostkey = NULL;
} }
/* List encryption algorithms (client->server then server->client). */ /* List encryption algorithms (client->server then server->client). */
for (k = KEXLIST_CSCIPHER; k <= KEXLIST_SCCIPHER; k++) { for (k = KEXLIST_CSCIPHER; k <= KEXLIST_SCCIPHER; k++) {
warn = false; warn = false;
#ifdef FUZZING #ifdef FUZZING
alg = ssh2_kexinit_addalg(kexlists[k], "none"); alg = ssh2_kexinit_addalg(&kexlists[K], "none");
alg->u.cipher.cipher = NULL; alg->u.cipher.cipher = NULL;
alg->u.cipher.warn = warn; alg->u.cipher.warn = warn;
#endif /* FUZZING */ #endif /* FUZZING */
@ -758,7 +758,7 @@ static void ssh2_write_kexinit_lists(
const ssh2_ciphers *c = preferred_ciphers[i]; const ssh2_ciphers *c = preferred_ciphers[i];
if (!c) warn = true; if (!c) warn = true;
else for (j = 0; j < c->nciphers; j++) { else for (j = 0; j < c->nciphers; j++) {
alg = ssh2_kexinit_addalg(kexlists[k], alg = ssh2_kexinit_addalg(&kexlists[k],
c->list[j]->ssh2_id); c->list[j]->ssh2_id);
alg->u.cipher.cipher = c->list[j]; alg->u.cipher.cipher = c->list[j];
alg->u.cipher.warn = warn; alg->u.cipher.warn = warn;
@ -785,7 +785,7 @@ static void ssh2_write_kexinit_lists(
alg->u.mac.etm = false; alg->u.mac.etm = false;
#endif /* FUZZING */ #endif /* FUZZING */
for (i = 0; i < nmacs; i++) { for (i = 0; i < nmacs; i++) {
alg = ssh2_kexinit_addalg(kexlists[j], maclist[i]->name); alg = ssh2_kexinit_addalg(&kexlists[j], maclist[i]->name);
alg->u.mac.mac = maclist[i]; alg->u.mac.mac = maclist[i];
alg->u.mac.etm = false; alg->u.mac.etm = false;
} }
@ -793,7 +793,7 @@ static void ssh2_write_kexinit_lists(
/* For each MAC, there may also be an ETM version, /* For each MAC, there may also be an ETM version,
* which we list second. */ * which we list second. */
if (maclist[i]->etm_name) { if (maclist[i]->etm_name) {
alg = ssh2_kexinit_addalg(kexlists[j], maclist[i]->etm_name); alg = ssh2_kexinit_addalg(&kexlists[j], maclist[i]->etm_name);
alg->u.mac.mac = maclist[i]; alg->u.mac.mac = maclist[i];
alg->u.mac.etm = true; alg->u.mac.etm = true;
} }
@ -806,22 +806,22 @@ static void ssh2_write_kexinit_lists(
for (j = KEXLIST_CSCOMP; j <= KEXLIST_SCCOMP; j++) { for (j = KEXLIST_CSCOMP; j <= KEXLIST_SCCOMP; j++) {
assert(lenof(compressions) > 1); assert(lenof(compressions) > 1);
/* Prefer non-delayed versions */ /* Prefer non-delayed versions */
alg = ssh2_kexinit_addalg(kexlists[j], preferred_comp->name); alg = ssh2_kexinit_addalg(&kexlists[j], preferred_comp->name);
alg->u.comp.comp = preferred_comp; alg->u.comp.comp = preferred_comp;
alg->u.comp.delayed = false; alg->u.comp.delayed = false;
if (preferred_comp->delayed_name) { if (preferred_comp->delayed_name) {
alg = ssh2_kexinit_addalg(kexlists[j], alg = ssh2_kexinit_addalg(&kexlists[j],
preferred_comp->delayed_name); preferred_comp->delayed_name);
alg->u.comp.comp = preferred_comp; alg->u.comp.comp = preferred_comp;
alg->u.comp.delayed = true; alg->u.comp.delayed = true;
} }
for (i = 0; i < lenof(compressions); i++) { for (i = 0; i < lenof(compressions); i++) {
const ssh_compression_alg *c = compressions[i]; const ssh_compression_alg *c = compressions[i];
alg = ssh2_kexinit_addalg(kexlists[j], c->name); alg = ssh2_kexinit_addalg(&kexlists[j], c->name);
alg->u.comp.comp = c; alg->u.comp.comp = c;
alg->u.comp.delayed = false; alg->u.comp.delayed = false;
if (c->delayed_name) { if (c->delayed_name) {
alg = ssh2_kexinit_addalg(kexlists[j], c->delayed_name); alg = ssh2_kexinit_addalg(&kexlists[j], c->delayed_name);
alg->u.comp.comp = c; alg->u.comp.comp = c;
alg->u.comp.delayed = true; alg->u.comp.delayed = true;
} }
@ -837,10 +837,8 @@ static void ssh2_write_kexinit_lists(
if (ssc && ssc->kex_override[i].ptr) { if (ssc && ssc->kex_override[i].ptr) {
put_datapl(list, ssc->kex_override[i]); put_datapl(list, ssc->kex_override[i]);
} else { } else {
for (j = 0; j < MAXKEXLIST; j++) { for (j = 0; j < kexlists[i].nalgs; j++)
if (kexlists[i][j].name.ptr == NULL) break; add_to_commasep_pl(list, kexlists[i].algs[j].name);
add_to_commasep_pl(list, kexlists[i][j].name);
}
} }
if (i == KEXLIST_KEX && first_time) { if (i == KEXLIST_KEX && first_time) {
if (our_hostkeys) /* we're the server */ if (our_hostkeys) /* we're the server */
@ -858,12 +856,12 @@ static void ssh2_write_kexinit_lists(
static bool ssh2_scan_kexinits( static bool ssh2_scan_kexinits(
ptrlen client_kexinit, ptrlen server_kexinit, ptrlen client_kexinit, ptrlen server_kexinit,
struct kexinit_algorithm kexlists[NKEXLIST][MAXKEXLIST], struct kexinit_algorithm_list kexlists[NKEXLIST],
const ssh_kex **kex_alg, const ssh_keyalg **hostkey_alg, const ssh_kex **kex_alg, const ssh_keyalg **hostkey_alg,
transport_direction *cs, transport_direction *sc, transport_direction *cs, transport_direction *sc,
bool *warn_kex, bool *warn_hk, bool *warn_cscipher, bool *warn_sccipher, bool *warn_kex, bool *warn_hk, bool *warn_cscipher, bool *warn_sccipher,
Ssh *ssh, bool *ignore_guess_cs_packet, bool *ignore_guess_sc_packet, Ssh *ssh, bool *ignore_guess_cs_packet, bool *ignore_guess_sc_packet,
int *n_server_hostkeys, int server_hostkeys[MAXKEXLIST], unsigned *hkflags, int *n_server_hostkeys, int *server_hostkeys, unsigned *hkflags,
bool *can_send_ext_info) bool *can_send_ext_info)
{ {
BinarySource client[1], server[1]; BinarySource client[1], server[1];
@ -928,10 +926,9 @@ static bool ssh2_scan_kexinits(
found_match: found_match:
selected[i] = NULL; selected[i] = NULL;
for (j = 0; j < MAXKEXLIST; j++) { for (j = 0; j < kexlists[i].nalgs; j++) {
if (kexlists[i][j].name.ptr && if (ptrlen_eq_ptrlen(found, kexlists[i].algs[j].name)) {
ptrlen_eq_ptrlen(found, kexlists[i][j].name)) { selected[i] = &kexlists[i].algs[j];
selected[i] = &kexlists[i][j];
break; break;
} }
} }
@ -1241,7 +1238,8 @@ static void ssh2_transport_process_queue(PacketProtocolLayer *ppl)
* selected algorithm identifiers. * selected algorithm identifiers.
*/ */
{ {
int nhk, hks[MAXKEXLIST], i, j; int nhk, i, j;
int *hks = snewn(s->kexlists[KEXLIST_HOSTKEY].nalgs, int);
if (!ssh2_scan_kexinits( if (!ssh2_scan_kexinits(
ptrlen_from_strbuf(s->client_kexinit), ptrlen_from_strbuf(s->client_kexinit),
@ -1249,8 +1247,10 @@ static void ssh2_transport_process_queue(PacketProtocolLayer *ppl)
s->kexlists, &s->kex_alg, &s->hostkey_alg, s->cstrans, s->kexlists, &s->kex_alg, &s->hostkey_alg, s->cstrans,
s->sctrans, &s->warn_kex, &s->warn_hk, &s->warn_cscipher, s->sctrans, &s->warn_kex, &s->warn_hk, &s->warn_cscipher,
&s->warn_sccipher, s->ppl.ssh, NULL, &s->ignorepkt, &nhk, hks, &s->warn_sccipher, s->ppl.ssh, NULL, &s->ignorepkt, &nhk, hks,
&s->hkflags, &s->can_send_ext_info)) &s->hkflags, &s->can_send_ext_info)) {
sfree(hks);
return; /* false means a fatal error function was called */ return; /* false means a fatal error function was called */
}
/* /*
* In addition to deciding which host key we're actually going * In addition to deciding which host key we're actually going
@ -1272,6 +1272,8 @@ static void ssh2_transport_process_queue(PacketProtocolLayer *ppl)
s->uncert_hostkeys[s->n_uncert_hostkeys++] = j; s->uncert_hostkeys[s->n_uncert_hostkeys++] = j;
} }
} }
sfree(hks);
} }
if (s->warn_kex) { if (s->warn_kex) {

7
ssh/transport2.h
View File

@ -18,7 +18,6 @@
#define DH_MIN_SIZE 1024 #define DH_MIN_SIZE 1024
#define DH_MAX_SIZE 8192 #define DH_MAX_SIZE 8192
#define MAXKEXLIST 16
struct kexinit_algorithm { struct kexinit_algorithm {
ptrlen name; ptrlen name;
union { union {
@ -45,6 +44,10 @@ struct kexinit_algorithm {
} comp; } comp;
} u; } u;
}; };
struct kexinit_algorithm_list {
struct kexinit_algorithm *algs;
size_t nalgs, algsize;
};
#define HOSTKEY_ALGORITHMS(X) \ #define HOSTKEY_ALGORITHMS(X) \
X(HK_ED25519, ssh_ecdsa_ed25519) \ X(HK_ED25519, ssh_ecdsa_ed25519) \
@ -190,7 +193,7 @@ struct ssh2_transport_state {
SeatPromptResult spr; SeatPromptResult spr;
bool guessok; bool guessok;
bool ignorepkt; bool ignorepkt;
struct kexinit_algorithm kexlists[NKEXLIST][MAXKEXLIST]; struct kexinit_algorithm_list kexlists[NKEXLIST];
#ifndef NO_GSSAPI #ifndef NO_GSSAPI
Ssh_gss_buf gss_buf; Ssh_gss_buf gss_buf;
Ssh_gss_buf gss_rcvtok, gss_sndtok; Ssh_gss_buf gss_rcvtok, gss_sndtok;