From 9d878dd9e08ea27aa60c2dce431f6cd9bd9208ed Mon Sep 17 00:00:00 2001 From: Jack Tjaden Date: Fri, 24 May 2024 12:57:38 -0600 Subject: [PATCH] Consistency and .zip file fixes for chapter 11 ssl tutorial --- wolfSSL/src/chapter11.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/wolfSSL/src/chapter11.md b/wolfSSL/src/chapter11.md index 8ea36b1e..e7dcb024 100644 --- a/wolfSSL/src/chapter11.md +++ b/wolfSSL/src/chapter11.md @@ -256,11 +256,7 @@ EchoClient: } ``` -<<<<<<< HEAD -The code above will go into `tcpcli01.c` after the variable definitions and the check for that the user has started the client with an IP address in `main()`. -======= Add the above code to `tcpcli01.c` in `mian()` after the variable definitions and the check that the user has started the client with an IP address. ->>>>>>> 9bffc79 (Consistency and .zip file fixes for chapter 11 ssl tutorial) EchoServer: @@ -302,11 +298,7 @@ When loading certificates into the `WOLFSSL_CTX`, the server certificate and key } ``` -<<<<<<< HEAD -The above code will go into `tcpserv04.c` after the variable definitions in `main()`. A version of the finished code is included in the SSL tutorial ZIP file for reference. -======= The code shown above should be added to the beginning of `tcpserv04.c` after the variable definitions in `main()`. A version of the finished code is included in the SSL tutorial ZIP file for reference. ->>>>>>> 9bffc79 (Consistency and .zip file fixes for chapter 11 ssl tutorial) Now that wolfSSL and the `WOLFSSL_CTX` have been initialized, make sure that the `WOLFSSL_CTX` object and the wolfSSL library are freed when the application is completely done using SSL/TLS. In both the client and the server, the following two lines should be placed at the end of the `main()` function (in the client right before the call to `exit()`):