WIP git tangle and sync with upstream

Author: gojimmypi

.gitignore

@@ -468,3 +468,47 @@ wrapper/Ada/obj/
 # Autogenerated debug trace headers
 wolfssl/debug-trace-error-codes.h
 wolfssl/debug-untrace-error-codes.h
+/wrapper/CSharp/SmartDeviceProject1
+/commit_squash.sh
+/gpg_refresh.sh
+/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32.clog
+/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32c2.clog
+/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32c3.clog
+/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32c6.clog
+/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32h2.clog
+/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32s2.clog
+/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32s3.clog
+/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp8266.clog
+/IDE/Espressif/ESP-IDF/examples/wolfssl_test/testAll.sh.wip
+/IDE/Espressif/ESP-IDF/examples/wolfssl_test/testMonitor.sh.wip
+/server_loop.sh
+/UpgradeLog.XML
+/wolfcrypt/src/evp.c.wip
+/wolfssl/PR_text.md
+/wolfssl-VS2022.vcxproj.user
+/wolfssl-VS2022a-options_h.vcxproj
+/wolfssl-VS2022a.sln
+/wolfssl-VS2022a.vcxproj
+/wolfssl.sln
+/wolfssl.vcproj.not found
+/wolfssl_VS2008.sln
+/wolfssl_VS2008.vcproj
+/wolfssl_VS2008CE.sln
+/wolfssl_VS2008CE.vcproj
+/wrapper/CSharp/wolfSSL-TLS-Client/wolfSSL-TLS-CE_2008_console.csproj
+/wrapper/CSharp/wolfSSL-TLS-Client/wolfSSL-TLS-Client-VS2008.csproj
+/wrapper/CSharp/wolfSSL-TLS-Client/wolfSSL-TLS_CE_2008.csproj
+/wrapper/CSharp/wolfSSL_CSharp/CSharp_CE_2008.csproj
+/wrapper/CSharp/wolfSSL_CSharp/CSharp_CE_2008.sln
+/wrapper/CSharp/wolfSSL_CSharp/wolfSSL_CSharp _VS2008.csproj
+/wrapper/CSharp/wolfSSL_CSharp-Clients-old.sln
+/wrapper/CSharp/wolfSSL_CSharp-Pull Request.sln
+/wrapper/CSharp/wolfssl_VS2008.sln
+/wrapper/CSharp/wolfssl_VS2008CE.sln
+/wrapper/CSharp/wolfssl_VS2012.sln
+/_UpgradeReport_Files
+/_UpgradeReport_Files/UpgradeReport.css
+/_UpgradeReport_Files/UpgradeReport.xslt
+/_UpgradeReport_Files/UpgradeReport_Minus.gif
+/_UpgradeReport_Files/UpgradeReport_Plus.gif
+/DLL Release (options.h)/x64

.wolfssl_known_macro_extras

@@ -874,6 +874,7 @@ WOLFSSL_UNALIGNED_64BIT_ACCESS
 WOLFSSL_USER_FILESYSTEM
 WOLFSSL_USER_LOG
 WOLFSSL_USER_MUTEX
+WOLFSSL_USER_SETTINGS_TAG
 WOLFSSL_USER_THREADING
 WOLFSSL_USE_ESP32C3_CRYPT_HASH_HW
 WOLFSSL_USE_FLASHMEM

IDE/WIN/user_settings.h

@@ -6,6 +6,8 @@
 #error This user_settings.h header is only designed for Windows
 #endif
 
+#define WOLFSSL_USER_SETTINGS_TAG "wolfssl v5.8.0 for IDE/WIN example config"
+
 #define USE_WOLFSSL_IO
 #define HAVE_AESGCM
 #define WOLFSSL_TLS13

src/ssl.c

@@ -15375,6 +15375,20 @@ const char* wolfSSL_lib_version(void)
     return LIBWOLFSSL_VERSION_STRING;
 }
 
+/* current user_settings.h breadcrumb tag */
+const char* wolfSSL_user_settings_tag(void)
+{
+#ifdef WOLFSSL_USER_SETTINGS
+    #ifdef WOLFSSL_USER_SETTINGS_TAG
+        return WOLFSSL_USER_SETTINGS_TAG;
+    #else
+        return "unknown or WOLFSSL_USER_SETTINGS_TAG not set"
+    #endif
+#else
+    return "WOLFSSL_USER_SETTINGS not defined, assuming options.h build"
+#endif
+}
+
 #ifdef OPENSSL_EXTRA
 #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
 const char* wolfSSL_OpenSSL_version(int a)

wolfssl/ssl.h

@@ -3288,6 +3288,8 @@ WOLFSSL_API void   wolfSSL_set_security_level(WOLFSSL * ssl, int level);
 
 /* which library version do we have */
 WOLFSSL_API const char* wolfSSL_lib_version(void);
+/* which user_settings.h file was used to build wolfssl */
+WOLFSSL_API const char* wolfSSL_user_settings_tag(void);
 #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
 WOLFSSL_API const char* wolfSSL_OpenSSL_version(int a);
 #else

wolfssl/wolfcrypt/settings.h

@@ -4504,6 +4504,17 @@ extern void uITRON4_free(void *p) ;
     #undef  WOLFSSL_DLL_TAG
 #endif
 
+/* Breadcrub to identify user_settings.h file */
+#ifdef WOLFSSL_USER_SETTINGS
+    #ifdef WOLFSSL_USER_SETTINGS_TAG
+        /* found a value, probably in in user_settings.h or -D build option */
+    #else
+        #define WOLFSSL_USER_SETTINGS_TAG "WOLFSSL_USER_SETTINGS_TAG not set"
+    #endif
+#else
+    #define WOLFSSL_USER_SETTINGS_TAG "WOLFSSL_USER_SETTINGS not defined"
+#endif
+
 /* Some final sanity checks. See esp32-crypt.h for Apple HomeKit config. */
 #if defined(WOLFSSL_APPLE_HOMEKIT) || defined(CONFIG_WOLFSSL_APPLE_HOMEKIT)
     #ifndef WOLFCRYPT_HAVE_SRP

wolfssl/wolfcrypt/wc_port.h

@@ -492,7 +492,7 @@
 #endif
 #elif defined(_MSC_VER) && !defined(WOLFSSL_NOT_WINDOWS_API)
     /* Use MSVC compiler intrinsics for atomic ops */
-    #ifdef _WIN32_WCE
+    #if defined(_WIN32_WCE) && defined(_M_ARM)
         #include <armintr.h>
     #else
         #include <intrin.h>

wrapper/CSharp/README.md

@@ -32,7 +32,7 @@ AdditionalIncludeDirectories="./;./wrapper/CSharp"
 ```
 
 
-See also the sample Windows user_settings.h in `[WOLFSSL_ROOT]/IDE/WIN``
+See also the alternative sample Windows `user_settings.h` in `[WOLFSSL_ROOT]/IDE/WIN`:
 
 ```
 AdditionalIncludeDirectories="./;./IDE/WIN"
@@ -49,7 +49,7 @@ Check that the proper preprocessor definitions are included: `BUILDING_WOLFSSL;W
 
 Syntax for project file:
 ```
-PreprocessorDefinitions="WOLFSSL_LIB;WOLFSSL_USER_SETTINGS"
+PreprocessorDefinitions="BUILDING_WOLFSSL;WOLFSSL_DLL;WOLFSSL_USER_SETTINGS"
 ```
 Some older versions of Visual Studio will require manually setting the Configure Type to create a DLL file:
 
@@ -69,7 +69,7 @@ error LNK2019: unresolved external symbol __imp__recv@16 ...
 
 Add `Ws2_32.lib` to Configuration Properties - Linker - ( Input || Additional Dependency)
 
-Note the `AnyCPU` Platform not work with C libraries compiled to a specific architecture.
+Note the `AnyCPU` Platform may not work with C libraries compiled to a specific architecture.
 An error like this will likely be encountered:
 
 ```
@@ -79,8 +79,8 @@ System.DllNotFoundException
   Source=wolfSSL_CSharp
   StackTrace:
    at wolfSSL.CSharp.wolfssl.wolfSSL_SetLoggingCb(loggingCb vc)
-   at wolfSSL.CSharp.wolfssl.SetLogging(loggingCb input) in C:\workspace\wolfssl-gojimmypi\wrapper\CSharp\wolfSSL_CSharp\wolfSSL.cs:line 2716
-   at wolfSSL_TLS_Client.Main(String[] args) in C:\workspace\wolfssl-gojimmypi\wrapper\CSharp\wolfSSL-TLS-Client\wolfSSL-TLS-Client.cs:line 151
+   at wolfSSL.CSharp.wolfssl.SetLogging(loggingCb input) in C:\workspace\wolfssl\wrapper\CSharp\wolfSSL_CSharp\wolfSSL.cs:line 2716
+   at wolfSSL_TLS_Client.Main(String[] args) in C:\workspace\wolfssl\wrapper\CSharp\wolfSSL-TLS-Client\wolfSSL-TLS-Client.cs:line 151
 ```
 
 There's a separate `wolfSSL_CSharp-Clients.sln` solution file to allow concurrent client

wrapper/CSharp/user_settings.h

@@ -24,6 +24,19 @@
 #ifndef _WIN_CSHARP_USER_SETTINGS_H_
 #define _WIN_CSHARP_USER_SETTINGS_H_
 
+#define WOLFSSL_USER_SETTINGS_TAG "wolfssl v5.8.0 for C# Wrapper v1.0"
+
+#ifdef WindowsCE
+    #define NO_WOLFSSL_DIR
+    #define WOLFSSL_NO_ATOMICS
+    #define WC_NO_ASYNC_THREADING
+    #define USE_WINDOWS_API
+    #define WOLFSSL_SMALL_STACK
+    #define MAX_SUPPORTED_THREADS 1024
+    #define MAX_SUPPORTED_PRIV_KEYS 1024
+    #define MAX_CONFIGURED_THREAD 512
+#endif
+
 /* Features */
 #define NO_OLD_TLS
 #define WOLFSSL_TLS13

wrapper/CSharp/wolfSSL-TLS-Client/wolfSSL-TLS-Client.cs

@@ -29,11 +29,11 @@
 #endif
 
 using System;
-using System.Runtime.InteropServices;
-using System.Text;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
+using System.Runtime.InteropServices;
+using System.Text;
 using wolfSSL;
 using wolfSSL.CSharp;
 
@@ -52,31 +52,13 @@ public class wolfSSL_TLS_Client
     public static int SERVER_PORT = 11111;
 
     // Optionally set explicit cipher, see wolfssl.CTX_set_cipher_list()
+    // #define USE_SPECIFIED_CIPHER
     public static string CIPHER_SUITE = "ECDHE-ECDSA-AES128-GCM-SHA256";
 
 
-#if WindowsCE || PocketPC
-    /// <summary>
-    /// Example of a logging function for Windows CE, string msg
-    /// </summary>
-    /// <param name="lvl">level of log</param>
-    /// <param name="msg">message to log</param>
-    public static void standard_log(int lvl, string msg)
-    {
-        string logMsg = wolfssl.MultiByteToWideChar(msg);
-        Console.WriteLine(logMsg);
-    }
-#else
-    /// <summary>
-    /// Example of a logging function, StringBuilder msg
-    /// </summary>
-    /// <param name="lvl">level of log</param>
-    /// <param name="msg">message to log</param>
-    public static void standard_log(int lvl, StringBuilder msg)
-    {
+    public static void standard_log(int lvl, StringBuilder msg) {
         Console.WriteLine(msg);
     }
-#endif
 
     /// <summary>
     /// Show error code and level for either last transmit or receive history parameter
@@ -214,6 +196,9 @@ public static void Main(string[] args)
         /* example of function used for setting logging */
         wolfssl.SetLogging(standard_log);
 
+        /* optionally clear logging callback */
+        /* wolfssl.ClearLogging(); */
+
         wolfssl.Init();
 
         Console.WriteLine("Calling ctx Init from wolfSSL");
@@ -225,7 +210,6 @@ public static void Main(string[] args)
         }
         Console.WriteLine("Finished init of ctx .... now load in CA");
 
-
         if (!File.Exists(caCert))
         {
             Console.WriteLine("Could not find CA cert file");