diff --git a/examples/client/client.c b/examples/client/client.c
index 86882c476..729aacdee 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -329,29 +329,6 @@ static void SetKeyShare(WOLFSSL* ssl, int onlyKeyShare, int useX25519,
 #endif
 
 #ifdef WOLFSSL_EARLY_DATA
-static void EarlyDataStatus(WOLFSSL* ssl)
-{
-    int earlyData_status;
-    
-    earlyData_status = wolfSSL_get_early_data_status(ssl);
-    if (earlyData_status < 0) return;
-    
-    printf("Early Data was ");
-    
-    switch(earlyData_status) {
-        case WOLFSSL_EARLY_DATA_NOT_SENT:
-                printf("not sent.\n");
-                break;
-        case WOLFSSL_EARLY_DATA_REJECTED:
-                printf("rejected.\n");
-                break;
-        case WOLFSSL_EARLY_DATA_ACCEPTED:
-                printf("accepted\n");
-                break;
-        default:
-                printf("unknown...\n");
-    }
-}
 static void EarlyData(WOLFSSL_CTX* ctx, WOLFSSL* ssl, const char* msg,
                       int msgSz, char* buffer)
 {
diff --git a/examples/server/server.c b/examples/server/server.c
index ad63565b0..00e17e80e 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -844,32 +844,6 @@ static const char* server_usage_msg[][56] = {
 #endif
 };
 
-#ifdef WOLFSSL_EARLY_DATA
-static void EarlyDataStatus(WOLFSSL* ssl)
-{
-    int earlyData_status;
-    
-    earlyData_status = wolfSSL_get_early_data_status(ssl);
-    if (earlyData_status < 0) return;
-    
-    printf("Early Data was ");
-    
-    switch(earlyData_status) {
-        case WOLFSSL_EARLY_DATA_NOT_SENT:
-                printf("not sent.\n");
-                break;
-        case WOLFSSL_EARLY_DATA_REJECTED:
-                printf("rejected.\n");
-                break;
-        case WOLFSSL_EARLY_DATA_ACCEPTED:
-                printf("accepted.\n");
-                break;
-        default:
-                printf("unknown...\n");
-    }
-}
-#endif
-
 static void Usage(void)
 {
     int msgId = 0;
diff --git a/src/ssl.c b/src/ssl.c
index e77ac2756..0b99b5fa4 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -42976,16 +42976,6 @@ err:
     defined(WOLFSSL_HAPROXY)
 
 #ifndef NO_SHA
-    /* One shot SHA hash of message.
-     *
-     * Wrap SHA1 one shot
-     */
-      unsigned char *wolfSSL_SHA(const unsigned char *d, size_t n,
-            unsigned char *md)
-     {
-        return wolfSSL_SHA1(d, n, md);
-    }
-
     /* One shot SHA1 hash of message.
      *
      * d  message to hash
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index 96ba70dcf..7c3491546 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -4367,7 +4367,7 @@ struct WOLFSSL {
 #ifdef WOLFSSL_EARLY_DATA
     EarlyDataState earlyData;
     word32 earlyDataSz;
-    word32 earlyDataStatus;
+    byte earlyDataStatus;
 #endif
 #ifdef OPENSSL_ALL
     long verifyCallbackResult;
diff --git a/wolfssl/openssl/sha.h b/wolfssl/openssl/sha.h
index 9db9a098e..c8ee6d4c6 100644
--- a/wolfssl/openssl/sha.h
+++ b/wolfssl/openssl/sha.h
@@ -75,7 +75,7 @@ typedef WOLFSSL_SHA_CTX SHA_CTX;
     (defined(HAVE_FIPS_VERSION) && HAVE_FIPS_VERSION > 2))
     /* SHA is only available in non-fips mode or fips version > 2 mode 
      * because of SHA enum in FIPS build. */
-    #define SHA wolfSSL_SHA
+    #define SHA wolfSSL_SHA1
 #endif
 
 #define SHA1_Init wolfSSL_SHA1_Init
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index a9f7f6738..d2bdfcf09 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -3638,7 +3638,6 @@ WOLFSSL_API void wolfSSL_set_verify_depth(WOLFSSL *ssl,int depth);
 WOLFSSL_API void* wolfSSL_get_app_data( const WOLFSSL *ssl);
 WOLFSSL_API int wolfSSL_set_app_data(WOLFSSL *ssl, void *arg);
 WOLFSSL_API WOLFSSL_ASN1_OBJECT * wolfSSL_X509_NAME_ENTRY_get_object(WOLFSSL_X509_NAME_ENTRY *ne);
-WOLFSSL_API unsigned char *wolfSSL_SHA(const unsigned char *d, size_t n, unsigned char *md);
 WOLFSSL_API unsigned char *wolfSSL_SHA1(const unsigned char *d, size_t n, unsigned char *md);
 WOLFSSL_API unsigned char *wolfSSL_SHA224(const unsigned char *d, size_t n, unsigned char *md);
 WOLFSSL_API unsigned char *wolfSSL_SHA256(const unsigned char *d, size_t n, unsigned char *md);
diff --git a/wolfssl/test.h b/wolfssl/test.h
index 5da853e60..50a5c96a2 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -4088,4 +4088,30 @@ static WC_INLINE word16 GetRandomPort(void)
     return port;
 }
 
+#ifdef WOLFSSL_EARLY_DATA
+static WC_INLINE void EarlyDataStatus(WOLFSSL* ssl)
+{
+    int earlyData_status;
+    
+    earlyData_status = wolfSSL_get_early_data_status(ssl);
+    if (earlyData_status < 0) return;
+    
+    printf("Early Data was ");
+    
+    switch(earlyData_status) {
+        case WOLFSSL_EARLY_DATA_NOT_SENT:
+                printf("not sent.\n");
+                break;
+        case WOLFSSL_EARLY_DATA_REJECTED:
+                printf("rejected.\n");
+                break;
+        case WOLFSSL_EARLY_DATA_ACCEPTED:
+                printf("accepted\n");
+                break;
+        default:
+                printf("unknown...\n");
+    }
+}
+#endif /* WOLFSSL_EARLY_DATA */
+
 #endif /* wolfSSL_TEST_H */