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

additional sanity checks

pull/115/head
Jacob Barthelmeh 2018-11-15 15:36:51 -07:00
parent b60ebf6cd7
commit 9f3d1f07d2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/internal.c
View File

@ -2329,7 +2329,8 @@ static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
} }
/* Add a pad byte if the mpint has the MSB set. */ /* Add a pad byte if the mpint has the MSB set. */
if (ret == 0) { if (ret == 0) {
if (ssh->handshake->primeGroup[0] & 0x80) if (ssh->handshake->primeGroup != NULL &&
ssh->handshake->primeGroup[0] & 0x80)
primeGroupPad = 1; primeGroupPad = 1;
/* Hash in the length of the GEX prime group. */ /* Hash in the length of the GEX prime group. */

4
src/ssh.c
View File

@ -496,6 +496,10 @@ int wolfSSH_connect(WOLFSSH* ssh)
/* no break */ /* no break */
case CONNECT_SERVER_KEXINIT_DONE: case CONNECT_SERVER_KEXINIT_DONE:
if (ssh->handshake == NULL) {
return WS_FATAL_ERROR;
}
if (ssh->handshake->kexId == ID_DH_GEX_SHA256) if (ssh->handshake->kexId == ID_DH_GEX_SHA256)
ssh->error = SendKexDhGexRequest(ssh); ssh->error = SendKexDhGexRequest(ssh);
else else