account for proto size difference

Author: JacobBarthelmeh

src/internal.c

@@ -2235,7 +2235,12 @@ static int DoKexInit(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
         }
 
         if (ret == WS_SUCCESS) {
+            byte SSH_PROTO_EOL_SZ = 1;
+
             strSz = (word32)WSTRLEN(sshProtoIdStr) - SSH_PROTO_EOL_SZ;
+            if (strSz > 1 && sshProtoIdStr[strSz - 1] == '\r') {
+                strSz--; /* subtract 1 more for CR */
+            }
             c32toa(strSz, scratchLen);
             ret = wc_HashUpdate(&ssh->handshake->hash, enmhashId,
                                 scratchLen, LENGTH_SZ);
@@ -5216,6 +5221,7 @@ int DoProtoId(WOLFSSH* ssh)
     int ret;
     word32 idSz;
     byte* eol;
+    byte  SSH_PROTO_EOL_SZ = 1;
 
     if ( (ret = GetInputText(ssh, &eol)) < 0) {
         WLOG(WS_LOG_DEBUG, "get input text failed");
@@ -5244,6 +5250,9 @@ int DoProtoId(WOLFSSH* ssh)
         ssh->clientOpenSSH = 1;
     }
 
+    if (*eol == '\r') {
+        SSH_PROTO_EOL_SZ++;
+    }
     *eol = 0;
 
     idSz = (word32)WSTRLEN((char*)ssh->inputBuffer.buffer);

wolfssh/internal.h

@@ -123,7 +123,6 @@ enum {
 #define SHA1_96_SZ 12
 #define UINT32_SZ 4
 #define SSH_PROTO_SZ 7 /* "SSH-2.0" */
-#define SSH_PROTO_EOL_SZ 2 /* Just the CRLF */
 #define AEAD_IMP_IV_SZ 4
 #define AEAD_EXP_IV_SZ 8
 #define AEAD_NONCE_SZ (AEAD_IMP_IV_SZ+AEAD_EXP_IV_SZ)