Skip to content

KEX fixes #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cconlon merged 1 commit into from
Oct 30, 2019
Merged

KEX fixes #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5483,30 +5483,30 @@ static const char cannedKexAlgoNames[] =
#if !defined(WOLFSSH_NO_ECDH_SHA2_NISTP256)
"ecdh-sha2-nistp256"
#endif
#if !defined(WOLFSSH_NO_ECDH_SHA2_NISTP256) && !defined(WOLFSSH_NO_ECDH_GEX_SHA256)
#if !defined(WOLFSSH_NO_ECDH_SHA2_NISTP256) && !defined(WOLFSSH_NO_DH_GEX_SHA256)
","
#endif
#if !defined(WOLFSSH_NO_ECDH_GEX_SHA256)
#if !defined(WOLFSSH_NO_DH_GEX_SHA256)
"diffie-hellman-group-exchange-sha256"
#endif
#if (!defined(WOLFSSH_NO_ECDH_SHA2_NISTP256) || !defined(WOLFSSH_NO_ECDH_GEX_SHA256))\
&& !defined(WOLFSSH_NO_ECDH_GROUP14_SHA1)
#if (!defined(WOLFSSH_NO_ECDH_SHA2_NISTP256) || !defined(WOLFSSH_NO_DH_GEX_SHA256))\
&& !defined(WOLFSSH_NO_DH_GROUP14_SHA1)
","
#endif
#if !defined(WOLFSSH_NO_ECDH_GROUP14_SHA1)
#if !defined(WOLFSSH_NO_DH_GROUP14_SHA1)
"diffie-hellman-group14-sha1"
#endif
#if (!defined(WOLFSSH_NO_ECDH_SHA2_NISTP256) || !defined(WOLFSSH_NO_ECDH_GEX_SHA256) \
|| !defined(WOLFSSH_NO_ECDH_GROUP14_SHA1)) && !defined(WOLFSSH_NO_ECDH_GROUP1_SHA1)
#if (!defined(WOLFSSH_NO_ECDH_SHA2_NISTP256) || !defined(WOLFSSH_NO_DH_GEX_SHA256) \
|| !defined(WOLFSSH_NO_DH_GROUP14_SHA1)) && !defined(WOLFSSH_NO_DH_GROUP1_SHA1)
","
#endif
#if !defined(WOLFSSH_NO_ECDH_GROUP1_SHA1)
#if !defined(WOLFSSH_NO_DH_GROUP1_SHA1)
"diffie-hellman-group1-sha1";
#endif
#if defined(WOLFSSH_NO_ECDH_SHA2_NISTP256) && defined(WOLFSSH_NO_ECDH_GEX_SHA256)\
&& defined(WOLFSSH_NO_ECDH_GROUP14_SHA1) && defined(WOLFSSH_NO_ECDH_GROUP1_SHA1)
#warning "You need at least one of ECDH-SHA2-NISTP256, ECDH-GEX-SHA256, "
"ECDH_GROUP14-SHA1 or ECDH-GROUP1-SHA1"
#if defined(WOLFSSH_NO_ECDH_SHA2_NISTP256) && defined(WOLFSSH_NO_DH_GEX_SHA256)\
&& defined(WOLFSSH_NO_DH_GROUP14_SHA1) && defined(WOLFSSH_NO_DH_GROUP1_SHA1)
#warning "You need at least one of ECDH-SHA2-NISTP256, DH-GEX-SHA256, "
"DH-GROUP14-SHA1 or DH-GROUP1-SHA1"
#endif

static const char cannedNoneNames[] = "none";
Expand Down Expand Up @@ -5993,7 +5993,7 @@ int SendKexDhReply(WOLFSSH* ssh)
if (ret == 0) {
if (!useEcc) {
DhKey privKey;
byte y[256];
byte y[MAX_KEX_KEY_SZ];
word32 ySz = sizeof(y);

ret = wc_InitDhKey(&privKey);
Expand Down Expand Up @@ -6364,6 +6364,10 @@ int SendKexDhGexRequest(WOLFSSH* ssh)

output[idx++] = MSGID_KEXDH_GEX_REQUEST;

WLOG(WS_LOG_INFO, " min = %u, preferred = %u, max = %u",
ssh->handshake->dhGexMinSz,
ssh->handshake->dhGexPreferredSz,
ssh->handshake->dhGexMaxSz);
c32toa(ssh->handshake->dhGexMinSz, output + idx);
idx += UINT32_SZ;
c32toa(ssh->handshake->dhGexPreferredSz, output + idx);
Expand Down Expand Up @@ -6466,7 +6470,7 @@ int SendKexDhInit(WOLFSSH* ssh)
word32 generatorSz = dhGeneratorSz;
int ret = WS_SUCCESS;
byte msgId = MSGID_KEXDH_INIT;
byte e[256];
byte e[MAX_KEX_KEY_SZ+1]; /* plus 1 in case of padding. */
word32 eSz = sizeof(e);
byte ePad = 0;

Expand Down Expand Up @@ -6563,7 +6567,7 @@ int SendKexDhInit(WOLFSSH* ssh)

if (ePad) {
output[idx] = 0;
idx += 1;
idx++;
}

WMEMCPY(output + idx, e, eSz);
Expand Down
11 changes: 8 additions & 3 deletions wolfssh/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ enum {
/* This is from RFC 4253 section 6.1. */
#define MAX_PACKET_SZ 35000
#endif
#ifndef MAX_KEX_KEY_SZ
/* This is based on the 3072-bit DH key that is the preferred size. */
#define MAX_KEX_KEY_SZ (3072 / 8)
#endif

WOLFSSH_LOCAL byte NameToId(const char*, word32);
WOLFSSH_LOCAL const char* IdToName(byte);
Expand Down Expand Up @@ -231,9 +235,10 @@ typedef struct HandshakeInfo {
Keys keys;
Keys peerKeys;
wc_HashAlg hash;
byte e[257]; /* May have a leading zero for unsigned or is a Q_S value. */
byte e[MAX_KEX_KEY_SZ+1]; /* May have a leading zero for unsigned
or is a Q_S value. */
word32 eSz;
byte x[257]; /* May have a leading zero, for unsigned. */
byte x[MAX_KEX_KEY_SZ+1]; /* May have a leading zero, for unsigned. */
word32 xSz;
byte* kexInit;
word32 kexInitSz;
Expand Down Expand Up @@ -387,7 +392,7 @@ struct WOLFSSH {

byte h[WC_MAX_DIGEST_SIZE];
word32 hSz;
byte k[257]; /* May have a leading zero, for unsigned. */
byte k[MAX_KEX_KEY_SZ+1]; /* May have a leading zero, for unsigned. */
word32 kSz;
byte sessionId[WC_MAX_DIGEST_SIZE];
word32 sessionIdSz;
Expand Down