commit 6b0d268bc919e14e0617169052e0ad874f2fca5c
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Mar 25 11:24:43 2014 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Mar 31 11:28:11 2014 +0200
tree 34f11dde12da22b5fc0149bcec5b60ee869047a3
parent 00d538f8f996601f3ef8b88d0ad855f84ae6f3c4

Add ssl_close_notify() to servers that missed it

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index eb48eb1..b5bfaed 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -1002,6 +1002,7 @@
         if( ret == 0 )
         {
             printf("\n\nEOF\n\n");
+            ssl_close_notify( &ssl );
             break;
         }
 
@@ -1010,12 +1011,12 @@
     }
     while( 1 );
 
-    ssl_close_notify( &ssl );
-
     if( opt.reconnect != 0 )
     {
         --opt.reconnect;
 
+        net_close( server_fd );
+
 #if defined(POLARSSL_TIMING_C)
         if( opt.reco_delay > 0 )
             m_sleep( 1000 * opt.reco_delay );
@@ -1055,6 +1056,8 @@
     }
 
 exit:
+    if( ret == POLARSSL_ERR_SSL_PEER_CLOSE_NOTIFY )
+        ret = 0;
 
 #ifdef POLARSSL_ERROR_C
     if( ret != 0 )
@@ -1062,9 +1065,6 @@
         char error_buf[100];
         polarssl_strerror( ret, error_buf, 100 );
         printf("Last error was: -0x%X - %s\n\n", -ret, error_buf );
-
-        if( ret == POLARSSL_ERR_SSL_PEER_CLOSE_NOTIFY )
-            ret = 0;
     }
 #endif