From cc5286594d49ed53b84972b74b9821d1a1ba814e Mon Sep 17 00:00:00 2001
From: Conner <conner@wolfssl.com>
Date: Fri, 26 May 2017 10:50:00 -0600
Subject: [PATCH] Fixed client-psk-resume error in which it did not resume with
 last session

---
 psk/README.md           | 8 ++++----
 psk/client-psk-resume.c | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/psk/README.md b/psk/README.md
index 51b1de4d..0efb6934 100644
--- a/psk/README.md
+++ b/psk/README.md
@@ -208,17 +208,17 @@ Session resumption allows a client/server pair to re-use previously generated cr
 3. Now we are ready to reconnect and start a new socket but we are going to reuse the session id to make things go a little faster.
 
 
-        sockfd = socket(AF_INET, SOCK_STREAM, 0);
+        sock = socket(AF_INET, SOCK_STREAM, 0);
 
         /* connect to the socket */
-        ret = connect(sockfd, (struct sockaddr *) &servaddr, sizeof(servaddr));
+        ret = connect(sock, (struct sockaddr *) &servaddr, sizeof(servaddr));
 
         if (ret != 0){
             return 1;
         }
 
         /* set the session ID to connect to the server */
-        wolfSSL_set_fd(sslResume, sockfd);
+        wolfSSL_set_fd(sslResume, sock);
         wolfSSL_set_session(sslResume, session);
 
 4. Check if the connect was successful.
@@ -245,7 +245,7 @@ Session resumption allows a client/server pair to re-use previously generated cr
         wolfSSL_shutdown(sslResume);
 
         /* shut down socket */
-        close(sockfd);
+        close(sock);
 
         /* clean up */
         wolfSSL_free(sslResume);
diff --git a/psk/client-psk-resume.c b/psk/client-psk-resume.c
index 000361fc..6bb7f2b5 100644
--- a/psk/client-psk-resume.c
+++ b/psk/client-psk-resume.c
@@ -158,10 +158,9 @@ int main(int argc, char **argv){
     /* close connection */
     close(sockfd);
 
-    /* cleanup */
+    /* cleanup without wolfSSL_Cleanup() for now */
     wolfSSL_free(ssl);
     wolfSSL_CTX_free(ctx);
-    wolfSSL_Cleanup();
 
     /*
      * resume session, start new connection and socket
@@ -206,7 +205,7 @@ int main(int argc, char **argv){
     /* shut down socket */
     close(sock);
 
-    /* clean up */
+    /* clean up now with wolfSSL_Cleanup() */
     wolfSSL_free(sslResume);
     wolfSSL_CTX_free(ctx);
     wolfSSL_Cleanup();