@@ -17582,27 +17582,43 @@ typedef struct {
1758217582 byte firstPacketFollows;
1758317583 byte expectIgnore;
1758417584 byte endpointType;
17585+ /* Our own lists, first choice first; NULL is the good id alone. */
17586+ const char* ourKexList;
17587+ const char* ourKeyList;
1758517588} FirstPacketFollowsCase;
1758617589
1758717590static const FirstPacketFollowsCase firstPacketFollowsCases[] = {
1758817591 { "follows=0, guesses irrelevant: flag stays off",
1758917592 FPF_KEX_BAD "," FPF_KEX_GOOD, FPF_KEY_BAD "," FPF_KEY_GOOD, 0, 0,
17590- WOLFSSH_ENDPOINT_SERVER },
17593+ WOLFSSH_ENDPOINT_SERVER, NULL, NULL },
1759117594 { "follows=1, both guesses match: do not skip",
17592- FPF_KEX_GOOD, FPF_KEY_GOOD, 1, 0, WOLFSSH_ENDPOINT_SERVER },
17595+ FPF_KEX_GOOD, FPF_KEY_GOOD, 1, 0, WOLFSSH_ENDPOINT_SERVER,
17596+ NULL, NULL },
1759317597 { "follows=1, KEX guess wrong: skip",
1759417598 FPF_KEX_BAD "," FPF_KEX_GOOD, FPF_KEY_GOOD, 1, 1,
17595- WOLFSSH_ENDPOINT_SERVER },
17599+ WOLFSSH_ENDPOINT_SERVER, NULL, NULL },
1759617600 { "follows=1, host-key guess wrong: skip", /* regression case */
1759717601 FPF_KEX_GOOD, FPF_KEY_BAD "," FPF_KEY_GOOD, 1, 1,
17598- WOLFSSH_ENDPOINT_SERVER },
17602+ WOLFSSH_ENDPOINT_SERVER, NULL, NULL },
1759917603 { "follows=1, both guesses wrong: skip",
1760017604 FPF_KEX_BAD "," FPF_KEX_GOOD, FPF_KEY_BAD "," FPF_KEY_GOOD, 1, 1,
17601- WOLFSSH_ENDPOINT_SERVER },
17605+ WOLFSSH_ENDPOINT_SERVER, NULL, NULL },
17606+ /* RFC 4253 section 7: a guess is right only when both sides list the
17607+ * same first choice, even if the client's first choice is negotiated. */
17608+ { "follows=1, same first choices, longer lists: do not skip",
17609+ FPF_KEX_GOOD "," FPF_KEX_BAD, FPF_KEY_GOOD "," FPF_KEY_BAD, 1, 0,
17610+ WOLFSSH_ENDPOINT_SERVER,
17611+ FPF_KEX_GOOD "," FPF_KEX_BAD, FPF_KEY_GOOD "," FPF_KEY_BAD },
17612+ { "follows=1, KEX first choices differ, guess negotiated: skip",
17613+ FPF_KEX_GOOD "," FPF_KEX_BAD, FPF_KEY_GOOD, 1, 1,
17614+ WOLFSSH_ENDPOINT_SERVER, FPF_KEX_BAD "," FPF_KEX_GOOD, NULL },
17615+ { "follows=1, host-key first choices differ, guess negotiated: skip",
17616+ FPF_KEX_GOOD, FPF_KEY_GOOD "," FPF_KEY_BAD, 1, 1,
17617+ WOLFSSH_ENDPOINT_SERVER, NULL, FPF_KEY_BAD "," FPF_KEY_GOOD },
1760217618 /* A server never sends a guessed packet; the client ignores the flag. */
1760317619 { "client, server follows=1, both guesses wrong: do not skip",
1760417620 FPF_KEX_BAD "," FPF_KEX_GOOD, FPF_KEY_BAD "," FPF_KEY_GOOD, 1, 0,
17605- WOLFSSH_ENDPOINT_CLIENT },
17621+ WOLFSSH_ENDPOINT_CLIENT, NULL, NULL },
1760617622};
1760717623
1760817624static void RunFirstPacketFollowsCase(const FirstPacketFollowsCase* tc)
@@ -17619,8 +17635,10 @@ static void RunFirstPacketFollowsCase(const FirstPacketFollowsCase* tc)
1761917635 ssh = wolfSSH_new(ctx);
1762017636 AssertNotNull(ssh);
1762117637
17622- AssertIntEQ(wolfSSH_SetAlgoListKex(ssh, FPF_KEX_GOOD), WS_SUCCESS);
17623- AssertIntEQ(wolfSSH_SetAlgoListKey(ssh, FPF_KEY_GOOD), WS_SUCCESS);
17638+ AssertIntEQ(wolfSSH_SetAlgoListKex(ssh, tc->ourKexList != NULL ?
17639+ tc->ourKexList : FPF_KEX_GOOD), WS_SUCCESS);
17640+ AssertIntEQ(wolfSSH_SetAlgoListKey(ssh, tc->ourKeyList != NULL ?
17641+ tc->ourKeyList : FPF_KEY_GOOD), WS_SUCCESS);
1762417642
1762517643 payloadSz = BuildKexInitPayload(ssh, tc->kexList, tc->keyList,
1762617644 tc->firstPacketFollows, payload, sizeof(payload));
0 commit comments