Skip to content

Fix for NO_FILESYSTEM and WOLFSSH_NO_AES_GCM and !HAVE_ECC #351

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
JacobBarthelmeh merged 4 commits into from
Jul 23, 2021
Merged

Fix for NO_FILESYSTEM and WOLFSSH_NO_AES_GCM and !HAVE_ECC #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5931aef
Fix for NO_FILESYSTEM and WOLFSSH_NO_AES_GCM
embhorn Mar 17, 2021
d02e600
Fix for not HAVE_ECC
embhorn Mar 17, 2021
ccc590c
Fix from review
embhorn Mar 18, 2021
326ae87
More disable flag fixes for ECDHE.
ejohnstown Jul 20, 2021
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
4 changes: 2 additions & 2 deletions examples/echoserver/echoserver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,14 +1123,14 @@ static int load_key(byte isEcc, byte* buf, word32 bufSz)
#else
/* using buffers instead */
if (isEcc) {
if (sizeof_ecc_key_der_256 > bufSz) {
if ((word32)sizeof_ecc_key_der_256 > bufSz) {
return 0;
}
WMEMCPY(buf, ecc_key_der_256, sizeof_ecc_key_der_256);
sz = sizeof_ecc_key_der_256;
}
else {
if (sizeof_rsa_key_der_2048 > bufSz) {
if ((word32)sizeof_rsa_key_der_2048 > bufSz) {
return 0;
}
WMEMCPY(buf, (byte*)rsa_key_der_2048, sizeof_rsa_key_der_2048);
Expand Down
4 changes: 2 additions & 2 deletions examples/server/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,14 @@ static int load_key(byte isEcc, byte* buf, word32 bufSz)
#else
/* using buffers instead */
if (isEcc) {
if (sizeof_ecc_key_der_256 > bufSz) {
if ((word32)sizeof_ecc_key_der_256 > bufSz) {
return 0;
}
WMEMCPY(buf, ecc_key_der_256, sizeof_ecc_key_der_256);
sz = sizeof_ecc_key_der_256;
}
else {
if (sizeof_rsa_key_der_2048 > bufSz) {
if ((word32)sizeof_rsa_key_der_2048 > bufSz) {
return 0;
}
WMEMCPY(buf, rsa_key_der_2048, sizeof_rsa_key_der_2048);
Expand Down
28 changes: 23 additions & 5 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2281,6 +2281,7 @@ static INLINE enum wc_HashType HashForId(byte id)
}


#if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECDH)
static INLINE int wcPrimeForId(byte id)
{
switch (id) {
Expand Down Expand Up @@ -2313,7 +2314,6 @@ static INLINE int wcPrimeForId(byte id)
}
}

#ifndef WOLFSSH_NO_ECDSA
static INLINE const char *PrimeNameForId(byte id)
{
switch (id) {
Expand All @@ -2333,7 +2333,7 @@ static INLINE const char *PrimeNameForId(byte id)
return "unknown";
}
}
#endif
#endif /* WOLFSSH_NO_ECDSA */


static INLINE byte AeadModeForId(byte id)
Expand Down Expand Up @@ -2871,10 +2871,14 @@ static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
int ret = WS_SUCCESS;
int tmpIdx = 0;
struct wolfSSH_sigKeyBlock *sigKeyBlock_ptr = NULL;
#ifndef WOLFSSH_NO_ECDH
ecc_key *key_ptr = NULL;
#ifndef WOLFSSH_SMALL_STACK
ecc_key key_s;
#endif
#endif
#ifndef WOLFSSH_SMALL_STACK
struct wolfSSH_sigKeyBlock s_sigKeyBlock;
ecc_key key_s;
#endif

WLOG(WS_LOG_DEBUG, "Entering DoKexDhReply()");
Expand Down Expand Up @@ -5880,6 +5884,7 @@ static INLINE int VerifyMac(WOLFSSH* ssh, const byte* in, word32 inSz,
}


#ifndef WOLFSSH_NO_AEAD
static INLINE void AeadIncrementExpIv(byte* iv)
{
int i;
Expand All @@ -5892,7 +5897,6 @@ static INLINE void AeadIncrementExpIv(byte* iv)
}


#ifndef WOLFSSH_NO_AEAD
static INLINE int EncryptAead(WOLFSSH* ssh, byte* cipher,
const byte* input, word16 sz,
byte* authTag, const byte* auth,
Expand Down Expand Up @@ -5964,7 +5968,7 @@ static INLINE int DecryptAead(WOLFSSH* ssh, byte* plain,

return ret;
}
#endif
#endif /* WOLFSSH_NO_AEAD */


int DoReceive(WOLFSSH* ssh)
Expand Down Expand Up @@ -6428,9 +6432,11 @@ static const char cannedKeyAlgoClientNames[] =
#endif

static const char cannedKeyAlgoRsaNames[] = "ssh-rsa";
#if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECDH)
static const char cannedKeyAlgoEcc256Names[] = "ecdsa-sha2-nistp256";
static const char cannedKeyAlgoEcc384Names[] = "ecdsa-sha2-nistp384";
static const char cannedKeyAlgoEcc521Names[] = "ecdsa-sha2-nistp521";
#endif

static const char cannedKexAlgoNames[] =
#if !defined(WOLFSSH_NO_ECDH_SHA2_NISTP521)
Expand Down Expand Up @@ -6470,12 +6476,14 @@ static const word32 cannedMacAlgoNamesSz = sizeof(cannedMacAlgoNames) - 2;
static const word32 cannedKeyAlgoClientNamesSz =
sizeof(cannedKeyAlgoClientNames) - 2;
static const word32 cannedKeyAlgoRsaNamesSz = sizeof(cannedKeyAlgoRsaNames) - 1;
#if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECDH)
static const word32 cannedKeyAlgoEcc256NamesSz =
sizeof(cannedKeyAlgoEcc256Names) - 1;
static const word32 cannedKeyAlgoEcc384NamesSz =
sizeof(cannedKeyAlgoEcc384Names) - 1;
static const word32 cannedKeyAlgoEcc521NamesSz =
sizeof(cannedKeyAlgoEcc521Names) - 1;
#endif
static const word32 cannedKexAlgoNamesSz = sizeof(cannedKexAlgoNames) - 2;
static const word32 cannedNoneNamesSz = sizeof(cannedNoneNames) - 1;

Expand Down Expand Up @@ -6509,6 +6517,7 @@ int SendKexInit(WOLFSSH* ssh)
if (ret == WS_SUCCESS) {
if (ssh->ctx->side == WOLFSSH_ENDPOINT_SERVER) {
switch (ssh->ctx->useEcc) {
#if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECDH)
case ECC_SECP256R1:
cannedKeyAlgoNames = cannedKeyAlgoEcc256Names;
cannedKeyAlgoNamesSz = cannedKeyAlgoEcc256NamesSz;
Expand All @@ -6521,6 +6530,7 @@ int SendKexInit(WOLFSSH* ssh)
cannedKeyAlgoNames = cannedKeyAlgoEcc521Names;
cannedKeyAlgoNamesSz = cannedKeyAlgoEcc521NamesSz;
break;
#endif
default:
cannedKeyAlgoNames = cannedKeyAlgoRsaNames;
cannedKeyAlgoNamesSz = cannedKeyAlgoRsaNamesSz;
Expand Down Expand Up @@ -6655,7 +6665,9 @@ int SendKexDhReply(WOLFSSH* ssh)
{
int ret = WS_SUCCESS;
byte *f_ptr = NULL, *sig_ptr = NULL;
#ifndef WOLFSSH_NO_ECDH
byte *r_ptr = NULL, *s_ptr = NULL;
#endif
byte scratchLen[LENGTH_SZ];
word32 fSz = KEX_F_SIZE;
word32 sigSz = KEX_SIG_SIZE;
Expand Down Expand Up @@ -7053,6 +7065,7 @@ int SendKexDhReply(WOLFSSH* ssh)
#endif /* ! WOLFSSH_NO_DH */
}
else {
#if !defined(WOLFSSH_NO_ECDH)
ecc_key pubKey;
ecc_key privKey;
int primeId;
Expand Down Expand Up @@ -7088,6 +7101,7 @@ int SendKexDhReply(WOLFSSH* ssh)
ssh->k, &ssh->kSz);
wc_ecc_free(&privKey);
wc_ecc_free(&pubKey);
#endif /* !defined(WOLFSSH_NO_ECDH) */
}
}

Expand Down Expand Up @@ -7651,6 +7665,7 @@ int SendKexDhInit(WOLFSSH* ssh)
#endif
}
else {
#if !defined(WOLFSSH_NO_ECDH)
ecc_key* privKey = &ssh->handshake->privKey.ecc;
int primeId = wcPrimeForId(ssh->handshake->kexId);

Expand All @@ -7670,6 +7685,9 @@ int SendKexDhInit(WOLFSSH* ssh)
privKey, primeId);
if (ret == 0)
ret = wc_ecc_export_x963(privKey, e, &eSz);
#else
ret = WS_INVALID_ALGO_ID;
#endif /* !defined(WOLFSSH_NO_ECDH) */
}

if (ret == 0)
Expand Down
4 changes: 2 additions & 2 deletions tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ static const char serverKeyEccDer[] =
"45747a834c61f33fad26cf22cda9a3bca561b47ce662d4c2f755439a31fb8011"
"20b5124b24f578d7fd22ef4635f005586b5f63c8da1bc4f569";
static const int serverKeyEccCurveId = ECC_SECP256R1;
#elif defined(WOLFSSH_NO_ECDSA_SHA2_NISTP384)
#elif !defined(WOLFSSH_NO_ECDSA_SHA2_NISTP384)
static const char serverKeyEccDer[] =
"3081a402010104303eadd2bbbf05a7be3a3f7c28151289de5bb3644d7011761d"
"b56f2a0362fba64f98e64ff986dc4fb8efdb2d6b8da57142a00706052b810400"
Expand All @@ -480,7 +480,7 @@ static const char serverKeyEccDer[] =
"b4c6a4cf5e97bd7e51e975e3e9217261506eb9cf3c493d3eb88d467b5f27ebab"
"2161c00066febd";
static const int serverKeyEccCurveId = ECC_SECP384R1;
#elif defined(WOLFSSH_NO_ECDSA_SHA2_NISTP521)
#elif !defined(WOLFSSH_NO_ECDSA_SHA2_NISTP521)
static const char serverKeyEccDer[] =
"3081dc0201010442004ca4d86428d9400e7b2df3912eb996c195895043af92e8"
"6de70ae4df46f22a291a6bb2748aae82580df6c39f49b3ed82f1789ece1b657d"
Expand Down
2 changes: 2 additions & 0 deletions wolfssh/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,9 @@ typedef struct HandshakeInfo {
#ifndef WOLFSSH_NO_DH
DhKey dh;
#endif
#if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECDH)
ecc_key ecc;
#endif
} privKey;
} HandshakeInfo;

Expand Down