From 72cbd9a44ef722b021c9b17fa99a261a5f946d94 Mon Sep 17 00:00:00 2001
From: Kareem <kareem@wolfssl.com>
Date: Tue, 21 Nov 2023 17:59:55 -0700
Subject: [PATCH] memcached: Code review feedback

---
 .github/workflows/memcached.yml | 4 +---
 src/ssl.c                       | 8 +-------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/memcached.yml b/.github/workflows/memcached.yml
index 4e384a022..33e9da39f 100644
--- a/.github/workflows/memcached.yml
+++ b/.github/workflows/memcached.yml
@@ -43,9 +43,7 @@ jobs:
       - name: Checkout OSP
         uses: actions/checkout@v3
         with:
-          # TODO: Change to upstream wolfssl/osp once merged
-          repository: kareem-wolfssl/osp
-          ref: memcached
+          repository: wolfssl/osp
           path: osp
 
       - name: Install dependencies
diff --git a/src/ssl.c b/src/ssl.c
index 35ad0483d..120835167 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -29505,13 +29505,7 @@ int wolfSSL_SSL_in_connect_init(WOLFSSL* ssl)
     if (ssl == NULL)
         return WOLFSSL_FAILURE;
 
-    if (ssl->options.side == WOLFSSL_CLIENT_END) {
-        return ssl->options.connectState > CONNECT_BEGIN &&
-            ssl->options.connectState < SECOND_REPLY_DONE;
-    }
-
-    return ssl->options.acceptState > ACCEPT_BEGIN &&
-        ssl->options.acceptState < ACCEPT_THIRD_REPLY_DONE;
+    return ssl->options.handShakeState == NULL_STATE;
 }
 
 #ifndef NO_SESSION_CACHE