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

Merge pull request #266 from ejohnstown/db 

Dropbear Interoperation Improvement
pull/270/head
JacobBarthelmeh 2020-07-08 09:49:22 -06:00 committed by GitHub
parent a4c1cb460b 810c1459dc
commit 8577ae147a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/internal.c
View File

@ -919,6 +919,9 @@ static const NameIdPair NameIdMap[] = {
{ ID_ECDH_SHA2_NISTP256, "ecdh-sha2-nistp256" }, { ID_ECDH_SHA2_NISTP256, "ecdh-sha2-nistp256" },
{ ID_ECDH_SHA2_NISTP384, "ecdh-sha2-nistp384" }, { ID_ECDH_SHA2_NISTP384, "ecdh-sha2-nistp384" },
{ ID_ECDH_SHA2_NISTP521, "ecdh-sha2-nistp521" }, { ID_ECDH_SHA2_NISTP521, "ecdh-sha2-nistp521" },
{ ID_ECDH_SHA2_ED25519, "curve25519-sha256" },
{ ID_ECDH_SHA2_ED25519_LIBSSH, "curve25519-sha256@libssh.org" },
{ ID_DH_GROUP14_SHA256, "diffie-hellman-group14-sha256" },
/* Public Key IDs */ /* Public Key IDs */
{ ID_SSH_RSA, "ssh-rsa" }, { ID_SSH_RSA, "ssh-rsa" },
@ -2027,7 +2030,7 @@ static int DoKexInit(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
int ret = WS_SUCCESS; int ret = WS_SUCCESS;
int side; int side;
byte algoId; byte algoId;
byte list[6] = {0}; byte list[8] = {ID_NONE};
word32 listSz; word32 listSz;
word32 skipSz; word32 skipSz;
word32 begin; word32 begin;
@ -2079,6 +2082,7 @@ static int DoKexInit(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
listSz = sizeof(list); listSz = sizeof(list);
ret = GetNameList(list, &listSz, buf, len, &begin); ret = GetNameList(list, &listSz, buf, len, &begin);
if (ret == WS_SUCCESS) { if (ret == WS_SUCCESS) {
ssh->handshake->kexIdGuess = list[0];
algoId = MatchIdLists(side, list, listSz, algoId = MatchIdLists(side, list, listSz,
cannedKexAlgo, cannedKexAlgoSz); cannedKexAlgo, cannedKexAlgoSz);
if (algoId == ID_UNKNOWN) { if (algoId == ID_UNKNOWN) {
@ -2264,6 +2268,10 @@ static int DoKexInit(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
if (ret == WS_SUCCESS) { if (ret == WS_SUCCESS) {
WLOG(WS_LOG_DEBUG, "DKI: KEX Packet Follows"); WLOG(WS_LOG_DEBUG, "DKI: KEX Packet Follows");
ret = GetBoolean(&ssh->handshake->kexPacketFollows, buf, len, &begin); ret = GetBoolean(&ssh->handshake->kexPacketFollows, buf, len, &begin);
if (ret == WS_SUCCESS) {
WLOG(WS_LOG_DEBUG, " packet follows: %s",
ssh->handshake->kexPacketFollows ? "yes" : "no");
}
} }
/* Skip the "for future use" length. */ /* Skip the "for future use" length. */
@ -2439,6 +2447,17 @@ static int DoKexDhInit(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
idx == NULL) idx == NULL)
ret = WS_BAD_ARGUMENT; ret = WS_BAD_ARGUMENT;
if (ret == WS_SUCCESS) {
if (ssh->handshake->kexPacketFollows
&& ssh->handshake->kexIdGuess != ssh->handshake->kexId) {
/* skip this message. */
ssh->handshake->kexPacketFollows = 0;
*idx += len;
return WS_SUCCESS;
}
}
if (ret == WS_SUCCESS) { if (ret == WS_SUCCESS) {
begin = *idx; begin = *idx;
ret = GetUint32(&eSz, buf, len, &begin); ret = GetUint32(&eSz, buf, len, &begin);

4
wolfssh/internal.h
View File

@ -82,6 +82,9 @@ enum {
ID_ECDH_SHA2_NISTP256, ID_ECDH_SHA2_NISTP256,
ID_ECDH_SHA2_NISTP384, ID_ECDH_SHA2_NISTP384,
ID_ECDH_SHA2_NISTP521, ID_ECDH_SHA2_NISTP521,
ID_ECDH_SHA2_ED25519,
ID_ECDH_SHA2_ED25519_LIBSSH,
ID_DH_GROUP14_SHA256,
/* Public Key IDs */ /* Public Key IDs */
ID_SSH_RSA, ID_SSH_RSA,
@ -231,6 +234,7 @@ typedef struct Keys {
typedef struct HandshakeInfo { typedef struct HandshakeInfo {
byte kexId; byte kexId;
byte kexIdGuess;
byte pubKeyId; byte pubKeyId;
byte encryptId; byte encryptId;
byte macId; byte macId;