manually apply WROOM32 refactor as noted in upstream wolfSSL#6587

gojimmypi · Jul 10, 2023 · 607d3cc · 607d3cc
1 parent cffcc7a
commit 607d3cc
Show file tree

Hide file tree

Showing 30 changed files with 370 additions and 370 deletions.
diff --git a/IDE/Espressif/ESP-IDF/README_32se.md b/IDE/Espressif/ESP-IDF/README_32se.md
@@ -15,7 +15,7 @@ Including the following examples:
 2. Microchip CryptoAuthentication Library: https://github.com/MicrochipTech/cryptoauthlib
 
 ## Setup
-1. Comment out `#define WOLFSSL_ESPWROOM32` in `/path/to/wolfssl/IDE/Espressif/ESP-IDF/user_settings.h`\
+1. Comment out `#define WOLFSSL_ESP32` in `/path/to/wolfssl/IDE/Espressif/ESP-IDF/user_settings.h`\
    Uncomment out `#define WOLFSSL_ESPWROOM32SE` in `/path/to/wolfssl/IDE/Espressif/ESP-IDF/user_settings.h`
     * **Note:** crypt test will fail if enabled `WOLFSSL_ESPWROOM32SE`
 3. wolfSSL under ESP-IDF. Please see [README.md](https://github.com/wolfSSL/wolfssl/blob/master/IDE/Espressif/ESP-IDF/README.md)

diff --git a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/components/wolfssl/include/user_settings.h b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/components/wolfssl/include/user_settings.h
@@ -22,9 +22,9 @@
 #include <sdkconfig.h> /* essential to chip set detection */
 
 #undef WOLFSSL_ESPIDF
-#undef WOLFSSL_ESPWROOM32
+#undef WOLFSSL_ESP32
 #undef WOLFSSL_ESPWROOM32SE
-#undef WOLFSSL_ESPWROOM32
+#undef WOLFSSL_ESP32
 #undef WOLFSSL_ESP8266
 
 /* The Espressif sdkconfig will have chipset info.
@@ -44,12 +44,12 @@
 /*
  * choose ONE of these Espressif chips to define:
  *
- * WOLFSSL_ESPWROOM32
+ * WOLFSSL_ESP32
  * WOLFSSL_ESPWROOM32SE
  * WOLFSSL_ESP8266
  */
 
-#define WOLFSSL_ESPWROOM32
+#define WOLFSSL_ESP32
 
 /* optionally turn off SHA512/224 SHA512/256 */
 /* #define WOLFSSL_NOSHA512_224 */
@@ -116,7 +116,7 @@
 #endif
 
 /* rsa primitive specific definition */
-#if defined(WOLFSSL_ESPWROOM32) || defined(WOLFSSL_ESPWROOM32SE)
+#if defined(WOLFSSL_ESP32) || defined(WOLFSSL_ESPWROOM32SE)
     /* Define USE_FAST_MATH and SMALL_STACK                        */
     #define ESP32_USE_RSA_PRIMITIVE
     /* threshold for performance adjustment for HW primitive use   */
@@ -128,7 +128,7 @@
 
 /* debug options */
 /* #define DEBUG_WOLFSSL */
-/* #define WOLFSSL_ESP32WROOM32_CRYPT_DEBUG */
+/* #define WOLFSSL_ESP32_CRYPT_DEBUG */
 /* #define WOLFSSL_ATECC508A_DEBUG          */
 
 /* date/time                               */
@@ -151,7 +151,7 @@
 
 #define WOLFSSL_SMALL_STACK
 
-#if defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(NO_WOLFSSL_ESP32WROOM32_CRYPT_AES)
+#if defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(NO_WOLFSSL_ESP32_CRYPT_AES)
     /* AES192 is not supported on the ESP32-S3 HW at this time */
     #define NO_AES_192
 #endif
@@ -208,63 +208,63 @@
 /* Default is HW enabled unless turned off.
 ** Uncomment these lines for SW: */
 #if defined(CONFIG_IDF_TARGET_ESP32)
-    /* #define NO_ESP32WROOM32_CRYPT                 */
-    /* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH    */
-    /* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_AES     */
-    /* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI */
+    /* #define NO_ESP32_CRYPT                 */
+    /* #define NO_WOLFSSL_ESP32_CRYPT_HASH    */
+    /* #define NO_WOLFSSL_ESP32_CRYPT_AES     */
+    /* #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI */
 #elif defined(CONFIG_IDF_TARGET_ESP32S2)
-    #define NO_ESP32WROOM32_CRYPT
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_AES
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI
+    #define NO_ESP32_CRYPT
+    #define NO_WOLFSSL_ESP32_CRYPT_HASH
+    #define NO_WOLFSSL_ESP32_CRYPT_AES
+    #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI
 #elif defined(CONFIG_IDF_TARGET_ESP32S3)
-    /* #define NO_ESP32WROOM32_CRYPT                 */
-    /* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH    */
-    /* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_AES     */
-    /* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI */
+    /* #define NO_ESP32_CRYPT                 */
+    /* #define NO_WOLFSSL_ESP32_CRYPT_HASH    */
+    /* #define NO_WOLFSSL_ESP32_CRYPT_AES     */
+    /* #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI */
 #elif defined(CONFIG_IDF_TARGET_ESP32C3)
-    #define NO_ESP32WROOM32_CRYPT
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_AES
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI
+    #define NO_ESP32_CRYPT
+    #define NO_WOLFSSL_ESP32_CRYPT_HASH
+    #define NO_WOLFSSL_ESP32_CRYPT_AES
+    #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI
 #elif defined(CONFIG_IDF_TARGET_ESP32C6)
-    #define NO_ESP32WROOM32_CRYPT
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_AES
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI
+    #define NO_ESP32_CRYPT
+    #define NO_WOLFSSL_ESP32_CRYPT_HASH
+    #define NO_WOLFSSL_ESP32_CRYPT_AES
+    #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI
 #elif defined(CONFIG_IDF_TARGET_ESP32H2)
-    #define NO_ESP32WROOM32_CRYPT
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_AES
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI
+    #define NO_ESP32_CRYPT
+    #define NO_WOLFSSL_ESP32_CRYPT_HASH
+    #define NO_WOLFSSL_ESP32_CRYPT_AES
+    #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI
 #else
-    #define NO_ESP32WROOM32_CRYPT
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_AES
-    #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI
+    #define NO_ESP32_CRYPT
+    #define NO_WOLFSSL_ESP32_CRYPT_HASH
+    #define NO_WOLFSSL_ESP32_CRYPT_AES
+    #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI
 #endif
 
 /* debug options */
 // #define ESP_VERIFY_MEMBLOCK
 #define WOLFSSL_HW_METRICS
 /* #define DEBUG_WOLFSSL_VERBOSE            */
 /* #define DEBUG_WOLFSSL                    */
-/* #define WOLFSSL_ESP32WROOM32_CRYPT_DEBUG */
+/* #define WOLFSSL_ESP32_CRYPT_DEBUG */
 #define NO_RECOVER_SOFTWARE_CALC
 
 /* optionally turn off individual math HW acceleration features */
 
 /* Turn off Large Number Multiplication:
 ** [Z = X * Y] in esp_mp_mul()                                  */
-/* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI_MP_MUL         */
+/* #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI_MP_MUL         */
 
 /* Turn off Large Number Modular Exponentiation:
 ** [Z = X^Y mod M] in esp_mp_exptmod()                          */
-/* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI_EXPTMOD        */
+/* #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI_EXPTMOD        */
 
 /* Turn off Large Number Modular Multiplication
 ** [Z = X × Y mod M] in esp_mp_mulmod()                         */
-/* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI_MULMOD         */
+/* #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI_MULMOD         */
 
 
 /* this is known to fail in TFM: */

diff --git a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/wolfssl/include/user_settings.h b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/wolfssl/include/user_settings.h
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 #undef WOLFSSL_ESPIDF
-#undef WOLFSSL_ESPWROOM32
+#undef WOLFSSL_ESP32
 #undef WOLFSSL_ESPWROOM32SE
-#undef WOLFSSL_ESPWROOM32
+#undef WOLFSSL_ESP32
 #undef WOLFSSL_ESP8266
 
 /* The Espressif sdkconfig will have chipset info.
@@ -40,12 +40,12 @@
 /*
  * choose ONE of these Espressif chips to define:
  *
- * WOLFSSL_ESPWROOM32
+ * WOLFSSL_ESP32
  * WOLFSSL_ESPWROOM32SE
  * WOLFSSL_ESP8266
  */
 
-#define WOLFSSL_ESPWROOM32
+#define WOLFSSL_ESP32
 
 /* #define DEBUG_WOLFSSL_VERBOSE */
 
@@ -97,7 +97,7 @@
 #endif
 
 /* RSA primitive specific definition */
-#if defined(WOLFSSL_ESPWROOM32) || defined(WOLFSSL_ESPWROOM32SE)
+#if defined(WOLFSSL_ESP32) || defined(WOLFSSL_ESPWROOM32SE)
     /* Define USE_FAST_MATH and SMALL_STACK                        */
     #define ESP32_USE_RSA_PRIMITIVE
     /* threshold for performance adjustment for HW primitive use   */
@@ -109,7 +109,7 @@
 
 /* debug options */
 /* #define DEBUG_WOLFSSL */
-/* #define WOLFSSL_ESP32WROOM32_CRYPT_DEBUG */
+/* #define WOLFSSL_ESP32_CRYPT_DEBUG */
 /* #define WOLFSSL_ATECC508A_DEBUG          */
 
 /* date/time                               */
@@ -119,15 +119,15 @@
 /* #define XTIME time */
 
 /* when you want not to use HW acceleration */
-/* #define NO_ESP32WROOM32_CRYPT */
-/* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH*/
-/* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_AES */
-/* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI */
+/* #define NO_ESP32_CRYPT */
+/* #define NO_WOLFSSL_ESP32_CRYPT_HASH*/
+/* #define NO_WOLFSSL_ESP32_CRYPT_AES */
+/* #define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI */
 
 /* adjust wait-timeout count if you see timeout in RSA HW acceleration */
 #define ESP_RSA_TIMEOUT_CNT    0x249F00
 
-#if defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(NO_WOLFSSL_ESP32WROOM32_CRYPT_AES)
+#if defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(NO_WOLFSSL_ESP32_CRYPT_AES)
     /* AES192 is not supported on the ESP32-S3 HW at this time */
     #define NO_AES_192
 #endif
diff --git a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/components/wolfssl/include/user_settings.h b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/components/wolfssl/include/user_settings.h
@@ -20,9 +20,9 @@
  */
 
 #undef WOLFSSL_ESPIDF
-#undef WOLFSSL_ESPWROOM32
+#undef WOLFSSL_ESP32
 #undef WOLFSSL_ESPWROOM32SE
-#undef WOLFSSL_ESPWROOM32
+#undef WOLFSSL_ESP32
 #undef WOLFSSL_ESP8266
 
 /* The Espressif sdkconfig will have chipset info.
@@ -41,12 +41,12 @@
 /*
  * choose ONE of these Espressif chips to define:
  *
- * WOLFSSL_ESPWROOM32
+ * WOLFSSL_ESP32
  * WOLFSSL_ESPWROOM32SE
  * WOLFSSL_ESP8266
  */
 
-#define WOLFSSL_ESPWROOM32
+#define WOLFSSL_ESP32
 /* #define WOLFSSL_NOSHA512_224 */
 /* #define WOLFSSL_NOSHA512_256 */
 
@@ -108,7 +108,7 @@
 #endif
 
 /* rsa primitive specific definition */
-#if defined(WOLFSSL_ESPWROOM32) || defined(WOLFSSL_ESPWROOM32SE)
+#if defined(WOLFSSL_ESP32) || defined(WOLFSSL_ESPWROOM32SE)
     /* Define USE_FAST_MATH and SMALL_STACK                        */
     #define ESP32_USE_RSA_PRIMITIVE
     /* threshold for performance adjustment for HW primitive use   */
@@ -120,7 +120,7 @@
 
 /* debug options */
 // #define DEBUG_WOLFSSL
-#define WOLFSSL_ESP32WROOM32_CRYPT_DEBUG
+#define WOLFSSL_ESP32_CRYPT_DEBUG
 /* #define WOLFSSL_ATECC508A_DEBUG          */
 
 /* date/time                               */
@@ -130,10 +130,10 @@
 /* #define XTIME time */
 
 /* when you want not to use HW acceleration */
-#define NO_ESP32WROOM32_CRYPT
-#define NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH
-#define NO_WOLFSSL_ESP32WROOM32_CRYPT_AES
-#define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI
+#define NO_ESP32_CRYPT
+#define NO_WOLFSSL_ESP32_CRYPT_HASH
+#define NO_WOLFSSL_ESP32_CRYPT_AES
+#define NO_WOLFSSL_ESP32_CRYPT_RSA_PRI
 
 /* adjust wait-timeout count if you see timeout in RSA HW acceleration */
 #define ESP_RSA_TIMEOUT_CNT    0x249F00
@@ -145,7 +145,7 @@
 #define USE_FAST_MATH
 #define WOLFSSL_SMALL_STACK
 
-#if defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(NO_WOLFSSL_ESP32WROOM32_CRYPT_AES)
+#if defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(NO_WOLFSSL_ESP32_CRYPT_AES)
     /* AES192 is not supported on the ESP32-S3 HW at this time */
     #define NO_AES_192
 #endif