lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-08 17:42:09 +03:00
Code Activity

Rename mbedtls_net_close() to mbedtls_net_free()

Browse Source 
close() may be more meaningful, but free() is symmetric with _init(), and more
consistent with all other modules
This commit is contained in:
Manuel Pégourié-Gonnard
2015-06-30 15:55:03 +02:00
parent 5db64328ab
commit 3d7d00ad23
18 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
programs/ssl/dtls_client.c
View File

@@ -326,7 +326,7 @@ exit:
}
#endif
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
mbedtls_x509_crt_free( &cacert );
mbedtls_ssl_free( &ssl );

6
programs/ssl/dtls_server.c
View File

@@ -256,7 +256,7 @@ reset:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_free( &client_fd );
mbedtls_ssl_session_reset( &ssl );
@@ -401,8 +401,8 @@ exit:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &client_fd );
mbedtls_net_free( &listen_fd );
mbedtls_x509_crt_free( &srvcert );
mbedtls_pk_free( &pkey );

2
programs/ssl/mini_client.c
View File

@@ -280,7 +280,7 @@ int main( void )
mbedtls_ssl_close_notify( &ssl );
exit:
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
mbedtls_ssl_free( &ssl );
mbedtls_ssl_config_free( &conf );

2
programs/ssl/ssl_client1.c
View File

@@ -290,7 +290,7 @@ exit:
}
#endif
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
mbedtls_x509_crt_free( &cacert );
mbedtls_ssl_free( &ssl );

4
programs/ssl/ssl_client2.c
View File

@@ -1503,7 +1503,7 @@ reconnect:
{
--opt.reconnect;
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
#if defined(MBEDTLS_TIMING_C)
if( opt.reco_delay > 0 )
@@ -1572,7 +1572,7 @@ exit:
}
#endif
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
#if defined(MBEDTLS_X509_CRT_PARSE_C)
mbedtls_x509_crt_free( &clicert );

8
programs/ssl/ssl_fork_server.c
View File

@@ -259,11 +259,11 @@ int main( void )
goto exit;
}
mbedtls_net_close( &client_fd );
mbedtls_net_free( &client_fd );
continue;
}
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &listen_fd );
/*
* 4. Setup stuff
@@ -385,8 +385,8 @@ int main( void )
}
exit:
mbedtls_net_close( &client_fd );
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &client_fd );
mbedtls_net_free( &listen_fd );
mbedtls_x509_crt_free( &srvcert );
mbedtls_pk_free( &pkey );

2
programs/ssl/ssl_mail_client.c
View File

@@ -819,7 +819,7 @@ int main( int argc, char *argv[] )
exit:
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
mbedtls_x509_crt_free( &clicert );
mbedtls_x509_crt_free( &cacert );
mbedtls_pk_free( &pkey );

4
programs/ssl/ssl_pthread_server.c
View File

@@ -265,7 +265,7 @@ thread_exit:
}
#endif
mbedtls_net_close( client_fd );
mbedtls_net_free( client_fd );
mbedtls_ssl_free( &ssl );
thread_info->thread_complete = 1;
@@ -491,7 +491,7 @@ reset:
if( ( ret = thread_create( &client_fd ) ) != 0 )
{
mbedtls_printf( " [ main ] failed: thread_create returned %d\n", ret );
mbedtls_net_close( &client_fd );
mbedtls_net_free( &client_fd );
goto reset;
}

6
programs/ssl/ssl_server.c
View File

@@ -237,7 +237,7 @@ reset:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_free( &client_fd );
mbedtls_ssl_session_reset( &ssl );
@@ -373,8 +373,8 @@ exit:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &client_fd );
mbedtls_net_free( &listen_fd );
mbedtls_x509_crt_free( &srvcert );
mbedtls_pk_free( &pkey );

10
programs/ssl/ssl_server2.c
View File

@@ -755,8 +755,8 @@ void term_handler( int sig )
{
((void) sig);
received_sigterm = 1;
mbedtls_net_close( &listen_fd ); /* causes mbedtls_net_accept() to abort */
mbedtls_net_close( &client_fd ); /* causes net_read() to abort */
mbedtls_net_free( &listen_fd ); /* causes mbedtls_net_accept() to abort */
mbedtls_net_free( &client_fd ); /* causes net_read() to abort */
}
#endif
@@ -1843,7 +1843,7 @@ reset:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_free( &client_fd );
mbedtls_ssl_session_reset( &ssl );
@@ -2252,8 +2252,8 @@ exit:
mbedtls_printf( " . Cleaning up..." );
fflush( stdout );
mbedtls_net_close( &client_fd );
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &client_fd );
mbedtls_net_free( &listen_fd );
#if defined(MBEDTLS_DHM_C) && defined(MBEDTLS_FS_IO)
mbedtls_dhm_free( &dhm );