Merge pull request #8621 from dgarske/dotnet35

Fixes for building with .NET 3.5

Author: douzzer

.wolfssl_known_macro_extras

@@ -518,6 +518,7 @@ USE_STSAFE_VERBOSE
 USE_TLSV13
 USE_WOLF_STRNSTR
 USS_API
+WindowsCE
 WC_AESXTS_STREAM_NO_REQUEST_ACCOUNTING
 WC_AES_BS_WORD_SIZE
 WC_AES_GCM_DEC_AUTH_EARLY

configure.ac

@@ -4321,7 +4321,8 @@ fi
 
 if test "$ENABLED_ECC" != "no"
 then
-    AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256"
+    AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC"
+
     if test "$ENABLED_ECC_SHAMIR" = "yes" && test "$ENABLED_LOWRESOURCE" = "no"
     then
         AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR"
@@ -4332,9 +4333,14 @@ then
         AM_CFLAGS="$AM_CFLAGS -DWC_ECC_NONBLOCK"
     fi
 
-    if test "$ENABLED_LOWRESOURCE" = "yes" && test "$ENABLED_FASTMATH" = "yes"
+    if test "$ENABLED_FASTMATH" = "yes"
     then
-        AM_CFLAGS="$AM_CFLAGS -DALT_ECC_SIZE"
+        if test "$ENABLED_LOWRESOURCE" = "yes"
+        then
+            AM_CFLAGS="$AM_CFLAGS -DALT_ECC_SIZE"
+        else
+            AM_CFLAGS="$AM_CFLAGS -DTFM_ECC256"
+        fi
     fi
 
     ENABLED_CERTS=yes

wolfssl/wolfcrypt/curve25519.h

@@ -166,7 +166,6 @@ curve25519_key* wc_curve25519_new(void* heap, int devId, int *result_code);
 WOLFSSL_API
 int wc_curve25519_delete(curve25519_key* key, curve25519_key** key_p);
 #endif
-WOLFSSL_API
 
 /* raw key helpers */
 WOLFSSL_API

wolfssl/wolfcrypt/ed25519.h

@@ -187,7 +187,6 @@ ed25519_key* wc_ed25519_new(void* heap, int devId, int *result_code);
 WOLFSSL_API
 int wc_ed25519_delete(ed25519_key* key, ed25519_key** key_p);
 #endif
-WOLFSSL_API
 
 #ifdef HAVE_ED25519_KEY_IMPORT
 WOLFSSL_API

wolfssl/wolfcrypt/logging.h

@@ -174,7 +174,7 @@ WOLFSSL_API void wolfSSL_SetLoggingPrefix(const char* prefix);
     #define WOLFSSL_STUB(m) \
         WOLFSSL_MSG(WOLFSSL_LOG_CAT(wolfSSL Stub, m, not implemented))
     WOLFSSL_API int WOLFSSL_IS_DEBUG_ON(void);
-#if defined(XVSNPRINTF)
+#if defined(XVSNPRINTF) && !defined(NO_WOLFSSL_MSG_EX)
     WOLFSSL_API void WOLFSSL_MSG_EX(const char* fmt, ...);
     #define HAVE_WOLFSSL_MSG_EX
 #else

wrapper/CSharp/wolfCrypt-Test/wolfCrypt-Test.cs

@@ -548,7 +548,7 @@ private static void curve25519_test()
         IntPtr keyB = IntPtr.Zero;
         IntPtr publicKeyA = IntPtr.Zero;
         IntPtr publicKeyB = IntPtr.Zero;
-        byte[] derKey;
+        byte[] rawPub, rawPrivate, derKey;
 
         Console.WriteLine("\nStarting Curve25519 shared secret test...");
 
@@ -569,6 +569,14 @@ private static void curve25519_test()
         }
         Console.WriteLine("Curve25519 Key generation test passed.");
 
+
+        /* Export Public Key A private and public to raw format */
+        wolfcrypt.Curve25519ExportKeyRaw(keyA, out rawPrivate, out rawPub);
+        /* Export Public Key B public to raw format */
+        rawPub = wolfcrypt.Curve25519ExportPublicKey(keyB);
+        /* rawPub / rawPrivate - not used */
+
+
         /* Export Public Key B to DER format */
         Console.WriteLine("Exporting Public Key B to DER format...");
         ret = wolfcrypt.Curve25519ExportPublicKeyToDer(keyB, out derKey, true);

wrapper/CSharp/wolfSSL_CSharp/X509.cs

@@ -1,4 +1,25 @@
-using System;
+/* X509.cs
+ *
+ * Copyright (C) 2006-2025 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+using System;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
@@ -9,6 +30,23 @@ public class X509
     {
         private const string wolfssl_dll = "wolfssl.dll";
 
+#if WindowsCE
+        [DllImport(wolfssl_dll)]
+        private extern static int wolfSSL_X509_get_pubkey_buffer(IntPtr x509, IntPtr buf, IntPtr bufSz);
+        [DllImport(wolfssl_dll)]
+        private extern static IntPtr wolfSSL_X509_get_der(IntPtr x509, IntPtr bufSz);
+        [DllImport(wolfssl_dll)]
+        private extern static void wolfSSL_X509_free(IntPtr x509);
+        [DllImport(wolfssl_dll)]
+        private extern static int wc_DerToPem(IntPtr der, int derSz, IntPtr pem, int pemSz, int type);
+
+        [DllImport(wolfssl_dll)]
+        private extern static IntPtr wolfSSL_X509_get_name_oneline(IntPtr x509Name, IntPtr buf, int bufSz);
+        [DllImport(wolfssl_dll)]
+        private extern static IntPtr wolfSSL_X509_get_subject_name(IntPtr x509);
+        [DllImport(wolfssl_dll)]
+        private extern static IntPtr wolfSSL_X509_get_issuer_name(IntPtr x509);
+#else
         [DllImport(wolfssl_dll, CallingConvention = CallingConvention.Cdecl)]
         private extern static int wolfSSL_X509_get_pubkey_buffer(IntPtr x509, IntPtr buf, IntPtr bufSz);
         [DllImport(wolfssl_dll, CallingConvention = CallingConvention.Cdecl)]
@@ -25,6 +63,7 @@ public class X509
         private extern static IntPtr wolfSSL_X509_get_subject_name(IntPtr x509);
         [DllImport(wolfssl_dll, CallingConvention = CallingConvention.Cdecl)]
         private extern static IntPtr wolfSSL_X509_get_issuer_name(IntPtr x509);
+#endif
 
         private IntPtr x509;
         private int    type;
@@ -51,11 +90,12 @@ public X509(IntPtr x509, bool isDynamic)
             this.x509 = x509;
             ret = wolfSSL_X509_get_name_oneline(
                 wolfSSL_X509_get_issuer_name(this.x509), IntPtr.Zero, 0);
-            this.Issuer = Marshal.PtrToStringAnsi(ret);
+            this.Issuer = wolfssl.PtrToStringAnsi(ret);
 
             ret = wolfSSL_X509_get_name_oneline(
                 wolfSSL_X509_get_subject_name(this.x509), IntPtr.Zero, 0);
-            this.Subject = Marshal.PtrToStringAnsi(ret);
+            this.Subject = wolfssl.PtrToStringAnsi(ret);
+
             this.isDynamic = isDynamic;
         }