WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes after reviewer's comments.

pull/327/head
Daniele Lacamera 2021-03-16 09:48:36 +01:00
parent 1d15b570b7
commit a36d91bc93
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/internal.c
View File

@ -3040,6 +3040,8 @@ static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
#endif #endif
sigKeyBlock_ptr = &s_sigKeyBlock; sigKeyBlock_ptr = &s_sigKeyBlock;
#endif #endif
}
if (ret == WS_SUCCESS) {
sig = buf + begin; sig = buf + begin;
tmpIdx = begin; tmpIdx = begin;
begin += sigSz; begin += sigSz;
@ -4084,7 +4086,7 @@ static int DoUserAuthRequestEcc(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk,
key_ptr = WMALLOC(sizeof(ecc_key), ssh->ctx->heap, DYNTYPE_PUBKEY); key_ptr = WMALLOC(sizeof(ecc_key), ssh->ctx->heap, DYNTYPE_PUBKEY);
sig_r_ptr = WMALLOC(sizeof(mp_int), ssh->ctx->heap, DYNTYPE_MPINT); sig_r_ptr = WMALLOC(sizeof(mp_int), ssh->ctx->heap, DYNTYPE_MPINT);
sig_s_ptr = WMALLOC(sizeof(mp_int), ssh->ctx->heap, DYNTYPE_MPINT); sig_s_ptr = WMALLOC(sizeof(mp_int), ssh->ctx->heap, DYNTYPE_MPINT);
if(key_ptr == NULL || sig_r_ptr == NULL || sig_s_ptr == NULL) if (key_ptr == NULL || sig_r_ptr == NULL || sig_s_ptr == NULL)
ret = WS_MEMORY_E; ret = WS_MEMORY_E;
#else #else
mp_int sig_r, sig_s; mp_int sig_r, sig_s;
@ -5495,7 +5497,7 @@ static int DoPacket(WOLFSSH* ssh)
} }
if (ret == WS_SUCCESS || ret == WS_CHAN_RXD || ret == WS_EXTDATA) { if (ret == WS_SUCCESS || ret == WS_CHAN_RXD || ret == WS_EXTDATA) {
if(payloadSz > 0){ if (payloadSz > 0){
idx += payloadIdx; idx += payloadIdx;
if (idx + padSz > len) if (idx + padSz > len)
{ {
@ -6568,7 +6570,7 @@ int SendKexDhReply(WOLFSSH* ssh)
ssh->ctx->heap, DYNTYPE_PRIVKEY); ssh->ctx->heap, DYNTYPE_PRIVKEY);
f_ptr = WMALLOC(KEX_F_SIZE, ssh->ctx->heap, DYNTYPE_BUFFER); f_ptr = WMALLOC(KEX_F_SIZE, ssh->ctx->heap, DYNTYPE_BUFFER);
sig_ptr = WMALLOC(KEX_SIG_SIZE, ssh->ctx->heap, DYNTYPE_BUFFER); sig_ptr = WMALLOC(KEX_SIG_SIZE, ssh->ctx->heap, DYNTYPE_BUFFER);
if(sigKeyBlock_ptr == NULL || f_ptr == NULL || sig_ptr == NULL) if (sigKeyBlock_ptr == NULL || f_ptr == NULL || sig_ptr == NULL)
ret = WS_MEMORY_E; ret = WS_MEMORY_E;
#else #else
struct wolfSSH_sigKeyBlockFull sigKeyBlock_s; struct wolfSSH_sigKeyBlockFull sigKeyBlock_s;
@ -6583,9 +6585,10 @@ int SendKexDhReply(WOLFSSH* ssh)
if (ret == WS_SUCCESS) { if (ret == WS_SUCCESS) {
if (ssh == NULL || ssh->handshake == NULL) { if (ssh == NULL || ssh->handshake == NULL) {
return WS_BAD_ARGUMENT; ret = WS_BAD_ARGUMENT;
} }
}
if (ret == WS_SUCCESS) {
WMEMSET(sigKeyBlock_ptr, 0, sizeof(struct wolfSSH_sigKeyBlockFull)); WMEMSET(sigKeyBlock_ptr, 0, sizeof(struct wolfSSH_sigKeyBlockFull));
sigKeyBlock_ptr->useRsa = ssh->handshake->pubKeyId == ID_SSH_RSA; sigKeyBlock_ptr->useRsa = ssh->handshake->pubKeyId == ID_SSH_RSA;
@ -8456,6 +8459,7 @@ int SendUserAuthRequest(WOLFSSH* ssh, byte authId, int addSig)
if (ssh == NULL) if (ssh == NULL)
ret = WS_BAD_ARGUMENT; ret = WS_BAD_ARGUMENT;
if (ret == WS_SUCCESS)
WMEMSET(keySig_ptr, 0, sizeof(WS_KeySignature)); WMEMSET(keySig_ptr, 0, sizeof(WS_KeySignature));
if (ret == WS_SUCCESS) { if (ret == WS_SUCCESS) {