From 511e92f57c6b9de790900a6b98798936419281e9 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Wed, 4 Sep 2024 17:17:34 -0700
Subject: [PATCH] WIP

---
 src/internal.c     | 6 +++---
 wolfssh/internal.h | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/internal.c b/src/internal.c
index e49437a6b..5b63b0358 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -1021,7 +1021,7 @@ WOLFSSH* SshInit(WOLFSSH* ssh, WOLFSSH_CTX* ctx)
     ssh->fs            = NULL;
     ssh->acceptState = ACCEPT_BEGIN;
     ssh->clientState = CLIENT_BEGIN;
-    ssh->isKeying    = 1;
+    ssh->keying    = 1;
     ssh->authId      = ID_USERAUTH_PUBLICKEY;
     ssh->supportedAuth[0] = ID_USERAUTH_PUBLICKEY;
     ssh->supportedAuth[1] = ID_USERAUTH_PASSWORD;
@@ -4139,7 +4139,7 @@ static int DoKexInit(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
         byte scratchLen[LENGTH_SZ];
         word32 strSz = 0;
 
-        if (!ssh->isKeying) {
+        if (!ssh->keying) {
             WLOG(WS_LOG_DEBUG, "Keying initiated");
             ret = SendKexInit(ssh);
         }
@@ -5683,7 +5683,7 @@ static int DoNewKeys(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
     if (ret == WS_SUCCESS) {
         ssh->rxCount = 0;
         ssh->highwaterFlag = 0;
-        ssh->isKeying = 0;
+        ssh->peerKeying = 0;
         HandshakeInfoFree(ssh->handshake, ssh->ctx->heap);
         ssh->handshake = NULL;
         WLOG(WS_LOG_DEBUG, "Keying completed");
diff --git a/wolfssh/internal.h b/wolfssh/internal.h
index 7aa36d87b..719e2d46a 100644
--- a/wolfssh/internal.h
+++ b/wolfssh/internal.h
@@ -695,7 +695,8 @@ struct WOLFSSH {
     byte clientState;
     byte serverState;
     byte processReplyState;
-    byte isKeying;
+    byte keying:1;
+    byte peerKeying:1;
     byte authId;           /* if using public key or password */
     byte supportedAuth[3]; /* supported auth IDs public key , password */