CSharp Wrapper Improvements

gojimmypi · gojimmypi · commit a1bc0fb7678e · 2025-06-30T21:16:39.000-07:00
diff --git a/src/bio.c b/src/bio.c
@@ -28,7 +28,12 @@
 
 #if !defined(WOLFSSL_BIO_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning bio.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                    "bio.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning bio.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/conf.c b/src/conf.c
@@ -23,7 +23,12 @@
 
 #if !defined(WOLFSSL_CONF_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning conf.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                    "conf.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning conf.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/pk.c b/src/pk.c
@@ -43,7 +43,12 @@
 
 #if !defined(WOLFSSL_PK_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning pk.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                    "pk.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning pk.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/ssl_asn1.c b/src/ssl_asn1.c
@@ -28,7 +28,13 @@
 
 #if !defined(WOLFSSL_SSL_ASN1_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning ssl_asn1.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                "ssl_asn1.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning \
+                 ssl_asn1.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/ssl_bn.c b/src/ssl_bn.c
@@ -28,7 +28,12 @@
 
 #if !defined(WOLFSSL_SSL_BN_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning ssl_bn.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                  "ssl_bn.c does not need to be compiled separately from ssl.c")
+        #else \
+            #warning ssl_bn.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/ssl_certman.c b/src/ssl_certman.c
@@ -25,7 +25,13 @@
 
 #if !defined(WOLFSSL_SSL_CERTMAN_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning ssl_certman.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+             "ssl_certman.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning \
+              ssl_certman.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/ssl_crypto.c b/src/ssl_crypto.c
@@ -23,7 +23,13 @@
 
 #ifndef WOLFSSL_SSL_CRYPTO_INCLUDED
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning ssl_crypto.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+              "ssl_crypto.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning \
+               ssl_crypto.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/ssl_load.c b/src/ssl_load.c
@@ -55,7 +55,13 @@
 
 #if !defined(WOLFSSL_SSL_LOAD_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning ssl_load.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                "ssl_load.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning \
+                 ssl_load.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
@@ -952,8 +958,8 @@ static int ProcessBufferTryDecodeDilithium(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
     word32 idx;
     dilithium_key* key;
     int keyFormatTemp = 0;
-    int keyTypeTemp;
-    int keySizeTemp;
+    int keyTypeTemp = 0;
+    int keySizeTemp = 0;
 
     /* Allocate a Dilithium key to parse into. */
     key = (dilithium_key*)XMALLOC(sizeof(dilithium_key), heap,
diff --git a/src/ssl_misc.c b/src/ssl_misc.c
@@ -23,7 +23,13 @@
 
 #if !defined(WOLFSSL_SSL_MISC_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning ssl_misc.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                "ssl_misc.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning \
+                 ssl_misc.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/ssl_p7p12.c b/src/ssl_p7p12.c
@@ -30,7 +30,13 @@
 
 #if !defined(WOLFSSL_SSL_P7P12_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning ssl_p7p12.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+               "ssl_p7p12.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning \
+                ssl_p7p12.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/ssl_sess.c b/src/ssl_sess.c
@@ -23,7 +23,13 @@
 
 #if !defined(WOLFSSL_SSL_SESS_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning ssl_sess.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                "ssl_sess.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning \
+                 ssl_sess.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/x509.c b/src/x509.c
@@ -23,7 +23,12 @@
 
 #if !defined(WOLFSSL_X509_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning x509.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                    "x509.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning x509.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #else
 
diff --git a/src/x509_str.c b/src/x509_str.c
@@ -23,7 +23,14 @@
 
 #if !defined(WOLFSSL_X509_STORE_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning x509_str.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                "x509_str.c does not need to be compiled separately from ssl.c")
+        #else
+            #warning \
+                 x509_str.c does not need to be compiled separately from ssl.c
+        #endif
+
     #endif
 #else
 
diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c
@@ -23,7 +23,12 @@
 
 #if !defined(WOLFSSL_EVP_INCLUDED)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning evp.c does not need to be compiled separately from ssl.c
+        #if defined(_MSC_VER)
+            #pragma message( \
+                    "evp.c does not need to be compiled separately from ssl.c")
+        #else \
+            #warning evp.c does not need to be compiled separately from ssl.c
+        #endif
     #endif
 #elif defined(WOLFCRYPT_ONLY)
 #else
diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c
@@ -50,7 +50,13 @@ masking and clearing memory logic.
 /* Check for if compiling misc.c when not needed. */
 #if !defined(WOLFSSL_MISC_INCLUDED) && !defined(NO_INLINE)
     #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning misc.c does not need to be compiled when using inline (NO_INLINE not defined)
+        #if defined(_MSC_VER)
+            #pragma message( \
+"misc.c does not need to be compiled when using inline (NO_INLINE not defined)")
+        #else
+            #warning \
+misc.c does not need to be compiled when using inline (NO_INLINE not defined)
+        #endif
     #endif
 
 #else
diff --git a/wolfssl/error-ssl.h b/wolfssl/error-ssl.h
@@ -242,7 +242,18 @@ enum wolfSSL_ErrorCodes {
     /* codes -1000 to -1999 are reserved for wolfCrypt. */
 };
 
-wc_static_assert((int)WC_LAST_E <= (int)WOLFSSL_LAST_E);
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)  /* VS2015 or newer */
+    #pragma warning(push)
+    /* Visual Studio complains: "operands are different enum types"
+     * even with explicity type cast. So ignore it here: */
+    #pragma warning(disable: 5287)
+    wc_static_assert((int)WC_LAST_E <= (int)WOLFSSL_LAST_E);
+    #pragma warning(pop)
+#else
+    wc_static_assert((int)WC_LAST_E <= (int)WOLFSSL_LAST_E);
+#endif
+
 
 /* I/O Callback default errors */
 enum IOerrors {
diff --git a/wolfssl/wolfcrypt/sp.h b/wolfssl/wolfcrypt/sp.h
@@ -28,7 +28,7 @@
 
 #if defined(WOLFSSL_HAVE_SP_RSA) || defined(WOLFSSL_HAVE_SP_DH) || \
                                     defined(WOLFSSL_HAVE_SP_ECC)
-#ifdef _WIN32_WCE
+#if defined(_WIN32_WCE) || (defined(_MSC_VER) && (_MSC_VER < 1600))
     typedef __int8           int8_t;
     typedef __int32          int32_t;
     typedef __int64          int64_t;
diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h
@@ -920,7 +920,11 @@ WOLFSSL_API void wolfSSL_SetIOWriteFlags(WOLFSSL* ssl, int flags);
         #if defined(__MINGW64__) && !defined(UNICODE)
             #define XINET_PTON(a,b,c)   InetPton((a),(b),(c))
         #else
-            #define XINET_PTON(a,b,c)   InetPton((a),(PCWSTR)(b),(c))
+            #if defined(_MSC_VER) && (_MSC_VER >= 1600)
+                #define XINET_PTON(a,b,c)   InetPton((a),(PCWSTR)(b),(c))
+            #else
+                #define XINET_PTON(a,b,c)   InetPton((a),(PCSTR)(b),(c))
+            #endif
         #endif
     #else
         #define XINET_PTON(a,b,c)   inet_pton((a),(b),(c))
diff --git a/wrapper/CSharp/README.md b/wrapper/CSharp/README.md
@@ -28,6 +28,45 @@ need to open a new solution `wolfSSL_CSharp.sln` located in `wrapper\CSharp\wolf
 Select the CPU type, configuration, and target file.
 select `Build` and either `Rebuild Solution` or `Build Solution`.
 
+The `wolfssl` project will typically need the `DLL_Debug` or `DLL_Release` configuration with `x64` platform.
+
+Note the `AnyCPU` Platform not work with C libraries compiled to a specific architecture.
+An error like this will likely be encountered:
+
+```
+System.DllNotFoundException
+  HResult=0x80131524
+  Message=Unable to load DLL 'wolfssl.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E)
+  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
+```
+
+There's a separate `wolfSSL_CSharp-Clients.sln` solution file to allow concurrent client
+applications in Visual Studio, with server running in `wolfSSL_CSharp.sln`.
+
+Be sure to right-click and "Set as Startup Project" for whichever sample is being used.
+
+If you see this error:
+
+```
+  'pwsh.exe' is not recognized as an internal or external command,
+  operable program or batch file.
+```
+
+Run PowerShell manually from Windows Start Icon. Output should look something like this:
+
+```
+Windows PowerShell
+Copyright (C) Microsoft Corporation. All rights reserved.
+
+Install the latest PowerShell for new features and improvements! https://aka.ms/PSWindows
+
+Loading personal and system profiles took 1026ms.
+```
+
 ## Linux (Ubuntu) using mono
 
 Prerequisites for linux:
diff --git a/wrapper/CSharp/include.am b/wrapper/CSharp/include.am
@@ -26,6 +26,7 @@ EXTRA_DIST+= wrapper/CSharp/wolfSSL-Example-IOCallbacks/Properties/AssemblyInfo.
 EXTRA_DIST+= wrapper/CSharp/wolfSSL-Example-IOCallbacks/wolfSSL-Example-IOCallbacks.cs
 EXTRA_DIST+= wrapper/CSharp/wolfSSL-Example-IOCallbacks/wolfSSL-Example-IOCallbacks.csproj
 EXTRA_DIST+= wrapper/CSharp/wolfSSL_CSharp.sln
+EXTRA_DIST+= wrapper/CSharp/wolfSSL_CSharp-Clients.sln
 EXTRA_DIST+= wrapper/CSharp/user_settings.h
 EXTRA_DIST+= wrapper/CSharp/wolfssl.vcxproj
 EXTRA_DIST+= wrapper/CSharp/wolfSSL_CSharp/Properties/AssemblyInfo.cs
diff --git a/wrapper/CSharp/wolfSSL-TLS-Client/wolfSSL-TLS-Client.cs b/wrapper/CSharp/wolfSSL-TLS-Client/wolfSSL-TLS-Client.cs
diff --git a/wrapper/CSharp/wolfSSL-TLS-PSK-Client/wolfSSL-TLS-PSK-Client.cs b/wrapper/CSharp/wolfSSL-TLS-PSK-Client/wolfSSL-TLS-PSK-Client.cs
diff --git a/wrapper/CSharp/wolfSSL-TLS-PSK-Server/wolfSSL-TLS-PSK-Server.cs b/wrapper/CSharp/wolfSSL-TLS-PSK-Server/wolfSSL-TLS-PSK-Server.cs
diff --git a/wrapper/CSharp/wolfSSL-TLS-Server/wolfSSL-TLS-Server.cs b/wrapper/CSharp/wolfSSL-TLS-Server/wolfSSL-TLS-Server.cs
diff --git a/wrapper/CSharp/wolfSSL_CSharp-Clients.sln b/wrapper/CSharp/wolfSSL_CSharp-Clients.sln
diff --git a/wrapper/CSharp/wolfSSL_CSharp/wolfCrypt.cs b/wrapper/CSharp/wolfSSL_CSharp/wolfCrypt.cs
diff --git a/wrapper/CSharp/wolfSSL_CSharp/wolfSSL.cs b/wrapper/CSharp/wolfSSL_CSharp/wolfSSL.cs
