From 1e2397aa5a45c6fa2c173f86efbc64f22ff55cec Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Wed, 5 Oct 2022 10:52:12 -0600
Subject: [PATCH] Implement peer review feedback and enhance PAA settings

---
 .../macOS-C++/Intel/user_settings.h           | 28 ++++---------------
 IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h | 17 ++++-------
 2 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h b/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h
index c6a56c057..2e28d1265 100755
--- a/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h
+++ b/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h
@@ -9,7 +9,7 @@
  * https://www.wolfssl.com
  */
 
-/* Custom wolfSSL user settings for GCC ARM */
+/* Custom wolfSSL user settings for XCODE-FIPSv2/macOS-C++/Intel */
 
 #ifndef WOLFSSL_USER_SETTINGS_H
 #define WOLFSSL_USER_SETTINGS_H
@@ -53,22 +53,7 @@ extern "C" {
     #define TFM_TIMING_RESISTANT
 
     #undef TFM_NO_ASM
-    #define TFM_NO_ASM
-
-    /* Optimizations */
-    //#define TFM_ARM
-#endif
-
-/* Wolf Single Precision Math */
-#undef WOLFSSL_SP
-#if 0 /* SP Assembly Speedups (wPAA) */
-    #define WOLFSSL_SP
-    #define WOLFSSL_SP_SMALL      /* use smaller version of code */
-    #define WOLFSSL_HAVE_SP_RSA
-    #define WOLFSSL_HAVE_SP_DH
-    #define WOLFSSL_HAVE_SP_ECC
-    #define WOLFSSL_ARMASM
-    #define WOLFSSL_SP_ARM64_ASM
+//    #define TFM_NO_ASM
 #endif
 
 #if 1 /* AESNI (wPAA) */
@@ -351,8 +336,7 @@ extern "C" {
 
 /* MD5 */
 #undef  NO_MD5
-#if 1
-
+#if 0 /* NOTE: If NO_OLD_TLS is not defined this needs to be set to '#if 1' */
 #else
     #define NO_MD5
 #endif
@@ -375,7 +359,7 @@ extern "C" {
 /* ------------------------------------------------------------------------- */
 /* Use reduced benchmark / test sizes */
 #undef  BENCH_EMBEDDED
-#define BENCH_EMBEDDED
+//#define BENCH_EMBEDDED
 
 #undef  USE_CERT_BUFFERS_2048
 #define USE_CERT_BUFFERS_2048
@@ -570,7 +554,7 @@ extern "C" {
 #define WOLFSSL_BASE64_ENCODE
 
 /* TLS Session Cache */
-#if 0
+#if 1
     #define SMALL_SESSION_CACHE
 #else
     #define NO_SESSION_CACHE
@@ -642,7 +626,7 @@ extern "C" {
 #define NO_RC4
 
 #undef  NO_OLD_TLS
-#define NO_OLD_TLS
+#define NO_OLD_TLS /* dependency on MD5, enable MD5 if this setting disabled */
 
 #undef  NO_PSK
 #define NO_PSK
diff --git a/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h b/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h
index 05182378d..21552aa1b 100755
--- a/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h
+++ b/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h
@@ -9,7 +9,7 @@
  * https://www.wolfssl.com
  */
 
-/* Custom wolfSSL user settings for GCC ARM */
+/* Custom wolfSSL user settings for XCODE-FIPSv2/macOS-C++/M1 */
 
 #ifndef WOLFSSL_USER_SETTINGS_H
 #define WOLFSSL_USER_SETTINGS_H
@@ -56,7 +56,7 @@ extern "C" {
     //#define TFM_NO_ASM
 
     /* Optimizations */
-    //#define TFM_ARM
+    #define TFM_ARM
 #endif
 
 /* Wolf Single Precision Math */
@@ -71,10 +71,6 @@ extern "C" {
     #define WOLFSSL_SP_ARM64_ASM
 #endif
 
-#if 0 /* AESNI (wPAA) */
-    #define WOLFSSL_AESNI
-#endif
-
 /* ------------------------------------------------------------------------- */
 /* FIPS - Requires eval or license from wolfSSL */
 /* ------------------------------------------------------------------------- */
@@ -351,8 +347,7 @@ extern "C" {
 
 /* MD5 */
 #undef  NO_MD5
-#if 1
-
+#if 0 /* NOTE: If NO_OLD_TLS is not defined this needs to be set to '#if 1' */
 #else
     #define NO_MD5
 #endif
@@ -375,7 +370,7 @@ extern "C" {
 /* ------------------------------------------------------------------------- */
 /* Use reduced benchmark / test sizes */
 #undef  BENCH_EMBEDDED
-#define BENCH_EMBEDDED
+//#define BENCH_EMBEDDED
 
 #undef  USE_CERT_BUFFERS_2048
 #define USE_CERT_BUFFERS_2048
@@ -570,7 +565,7 @@ extern "C" {
 #define WOLFSSL_BASE64_ENCODE
 
 /* TLS Session Cache */
-#if 0
+#if 1
     #define SMALL_SESSION_CACHE
 #else
     #define NO_SESSION_CACHE
@@ -642,7 +637,7 @@ extern "C" {
 #define NO_RC4
 
 #undef  NO_OLD_TLS
-#define NO_OLD_TLS
+#define NO_OLD_TLS /* dependency on MD5, enable MD5 if this setting disabled */
 
 #undef  NO_PSK
 #define NO_PSK