CSharp Wrapper SNI Support #7610

gasbytes · 2024-06-03T14:54:32Z

Description

Fixes zd#17990

Checklist

added tests
updated/added doxygen
updated appropriate READMEs
Updated manual and documentation

wrapper/CSharp/wolfSSL_CSharp/wolfSSL.cs

dgarske · 2024-06-03T16:11:55Z

wrapper/CSharp/wolfSSL_CSharp/wolfSSL.cs

@@ -417,6 +459,8 @@ public void free()

        public static readonly int SUCCESS = 1;
        public static readonly int FAILURE = 0;
+        public static readonly int WOLFSSL_SNI_HOST_NAME = 0;
+        public static readonly int WOLFSSL_SNI_HOST_NAME_OUTER = 0;


Can you please remove WOLFSSL_SNI_HOST_NAME_OUTER here and also in ssl.h. I cannot find any place it is used and its a duplicate value in the enum, which is odd.

… got lost during editing)

… the name client side via -S flag

dgarske · 2024-06-03T21:46:35Z

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

+    /// </summary>
+    private static bool haveSNI(string[] args) 
+    {
+        if (args != null && args.Length == 2 && args[0] == "-S") 


Is this working for you? mono wolfSSL.exe -S shows SNI IS: OFF

dgarske · 2024-06-03T21:46:57Z

wrapper/CSharp/README.md

 ```

-Build wolfSSL and install:
+# Build wolfSSL and install


Make ### for right heading.

dgarske · 2024-06-03T21:47:01Z

wrapper/CSharp/README.md

@@ -38,21 +40,21 @@ make check
 sudo make install
 ```

-Build and run the wrapper:
+# Build and run the wrapper


Make ### for right heading.

Can you also show building the client with mono and add SNI example / docs?

dgarske · 2024-06-03T21:47:06Z

wrapper/CSharp/README.md


-Run the example:
+# Run the example


Make ### for right heading.

- removed tlsext callback (since it's a compatibility one) - updated testing examples and wrapper

dgarske

Awesome work. Very close to complete!

dgarske · 2024-06-04T17:17:02Z

wolfssl/ssl.h

@@ -3811,7 +3811,6 @@ WOLFSSL_API void* wolfSSL_CTX_GetHeap(WOLFSSL_CTX* ctx, WOLFSSL* ssl);
 /* SNI types */
 enum {
    WOLFSSL_SNI_HOST_NAME = 0,
-    WOLFSSL_SNI_HOST_NAME_OUTER = 0,


Note: This was an artifact from an early ECH that was later changed and this was left behind and should be removed.

dgarske · 2024-06-04T17:19:15Z

src/ssl.c

@@ -20224,6 +20206,27 @@ void wolfSSL_THREADID_set_numeric(void* id, unsigned long val)
        * HAVE_LIGHTY || WOLFSSL_HAPROXY || WOLFSSL_OPENSSH ||
        * HAVE_SBLIM_SFCB)) */

+#ifdef HAVE_SNI


Note: Moved these outside of the strict compatibility layer macros and made accessible to match the WOLFSSL_CTX member of HAVE_SNI only.

dgarske · 2024-06-04T17:26:22Z

wrapper/CSharp/README.md

+
+### Enabling SNI
+
+To enable SNI, just pass the `-S` argument with the specified hostname:


The server.exe also needs run with -S to work. Please add that to the steps.

dgarske · 2024-06-04T17:27:47Z

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

+    /// wolfSSL.
+    /// <param name="args">Parameters passed via command line</param>
+    /// </summary>
+    private static bool haveSNI(string[] args)


Please have this function return int with the index for the i+1 instead of bool, so you don't have to hard code args[1].Trim(); below. Use -1 to indicate not found.

dgarske · 2024-06-04T17:28:31Z

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

+            return;
+        }
+
+        if (haveSNI(args)) 


Update to:

int sniArg = haveSNI(args); if (sniArg >= 0) { string sniHostNameString = args[sniArg].Trim();

JacobBarthelmeh · 2024-06-04T17:50:11Z

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

-        string fileCert = @"server-cert.pem";
-        string fileKey = @"server-key.pem";
+        string fileCert = @"../../certs/server-cert.pem";
+        string fileKey = @"../../certs/server-key.pem";


this change has implications on the Windows VS build:

PS D:\work\sni-wrappers\wrapper\CSharp\DLL Debug\Win32> .\wolfSSL-TLS-Server.exe Calling ctx Init from wolfSSL Finished init of ctx .... now load in cert and key Could not find cert or key file freeing ctx handle

Might consider logic like wolfssl/test.h ChangeToWolfRoot or gate the path based on _WIN32...

…icates; - Updated all the examples with it;

dgarske · 2024-06-05T15:30:02Z

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

@@ -87,6 +121,12 @@ public static void Main(string[] args)
            return;
        }

+        if (!File.Exists(dhparam.ToString())) {


I tried this on Visual Studio 2022. Got this error:

The name 'dhparam' does not exist in the current context wolfSSL-TLS-Server C:\Users\David Garske\Documents\wolfssl\wrapper\CSharp\wolfSSL-TLS-Server\wolfSSL-TLS-Server.cs 124

dgarske

Tested on Windows and Linux. Thanks Reda. @JacobBarthelmeh will you give it a final?

CSharp Wrapper SNI Support

gasbytes added 5 commits May 30, 2024 15:41

environment setup, updated the README

23bfb01

prototypes

0956091

minor changes to the prototypes and actual implementation

52f1caf

added missing wrappers for sni setup & frees

15ac366

completed the examples

6f567b5

gasbytes marked this pull request as draft June 3, 2024 14:54

gasbytes requested review from wolfSSL-Bot and JacobBarthelmeh June 3, 2024 14:57

gasbytes assigned gasbytes and wolfSSL-Bot and unassigned wolfSSL-Bot and gasbytes Jun 3, 2024

gasbytes marked this pull request as ready for review June 3, 2024 15:41

gasbytes removed the request for review from wolfSSL-Bot June 3, 2024 15:47

dgarske changed the title ~~Sni wrappers~~ CSharp Wrapper SNI Support Jun 3, 2024

dgarske requested changes Jun 3, 2024

View reviewed changes

dgarske assigned gasbytes Jun 3, 2024

removed WOLFSSL_SNI_HOST_NAME_OUTER && minor fix (missing sniHostName…

c325de9

… got lost during editing)

dgarske self-requested a review June 3, 2024 19:24

dgarske self-assigned this Jun 3, 2024

gasbytes added 2 commits June 3, 2024 21:24

added callback example: setting sni cb & arg server side, and passing…

c04c768

… the name client side via -S flag

removed sniHostName no longer used

b2e7707

dgarske requested changes Jun 3, 2024

View reviewed changes

dgarske removed their assignment Jun 3, 2024

gasbytes added 3 commits June 4, 2024 17:54

updated readme & sni function

5d0b7e0

- Applied David's patch to get access to the missing sni callback (arg)

983610e

- removed tlsext callback (since it's a compatibility one) - updated testing examples and wrapper

made the workflow to compile & executes easier, updated the readme also

70fc5c9

dgarske self-requested a review June 4, 2024 17:16

dgarske requested changes Jun 4, 2024

View reviewed changes

JacobBarthelmeh requested changes Jun 4, 2024

View reviewed changes

gasbytes added 3 commits June 4, 2024 23:08

updated the README & haveSNI function

f231c7b

fixed windows build path problem

6cb97a7

- Platform specific function to correctly set the path for the certif…

2ab709c

…icates; - Updated all the examples with it;

dgarske requested changes Jun 5, 2024

View reviewed changes

dgarske approved these changes Jun 5, 2024

View reviewed changes

dgarske assigned JacobBarthelmeh Jun 5, 2024

dgarske requested a review from JacobBarthelmeh June 5, 2024 15:43

dh2048Pem -> dhparam

453e2fa

JacobBarthelmeh approved these changes Jun 5, 2024

View reviewed changes

JacobBarthelmeh unassigned JacobBarthelmeh and gasbytes Jun 5, 2024

JacobBarthelmeh merged commit 1852615 into wolfSSL:master Jun 5, 2024
109 checks passed

jefferyq2 pushed a commit to jefferyq2/wolfssl that referenced this pull request Jun 9, 2024

Merge pull request wolfSSL#7610 from gasbytes/sni-wrappers

1bc7d33

CSharp Wrapper SNI Support

gasbytes deleted the sni-wrappers branch August 28, 2024 13:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CSharp Wrapper SNI Support #7610

CSharp Wrapper SNI Support #7610

gasbytes commented Jun 3, 2024

dgarske Jun 3, 2024

dgarske Jun 3, 2024

dgarske Jun 3, 2024

dgarske Jun 3, 2024

dgarske Jun 3, 2024

dgarske Jun 3, 2024

dgarske left a comment

dgarske Jun 4, 2024

dgarske Jun 4, 2024

dgarske Jun 4, 2024

dgarske Jun 4, 2024

dgarske Jun 4, 2024

JacobBarthelmeh Jun 4, 2024

dgarske Jun 4, 2024

dgarske Jun 5, 2024

dgarske left a comment


		### Enabling SNI

		To enable SNI, just pass the `-S` argument with the specified hostname:

CSharp Wrapper SNI Support #7610

CSharp Wrapper SNI Support #7610

Conversation

gasbytes commented Jun 3, 2024

Description

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dgarske left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dgarske left a comment

Choose a reason for hiding this comment