cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-10-30 19:20:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Quit using deprecated ssl_set_bio() in programs

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-25 19:38:23 +01:00
parent 9a65e80e4f
commit aeab252fef
7 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/ssl/mini_client.c
View File

@ -234,7 +234,7 @@ int main( void )
goto exit; goto exit;
} }
ssl_set_bio( &ssl, net_recv, &server_fd, net_send, &server_fd ); ssl_set_bio_timeout( &ssl, &server_fd, net_send, net_recv, NULL, 0 );
if( ssl_handshake( &ssl ) != 0 ) if( ssl_handshake( &ssl ) != 0 )
{ {

3
programs/ssl/ssl_client1.c
View File

@ -176,8 +176,7 @@ int main( void )
ssl_set_rng( &ssl, ctr_drbg_random, &ctr_drbg ); ssl_set_rng( &ssl, ctr_drbg_random, &ctr_drbg );
ssl_set_dbg( &ssl, my_debug, stdout ); ssl_set_dbg( &ssl, my_debug, stdout );
ssl_set_bio( &ssl, net_recv, &server_fd, ssl_set_bio_timeout( &ssl, &server_fd, net_send, net_recv, NULL, 0 );
net_send, &server_fd );
/* /*
* 4. Handshake * 4. Handshake

3
programs/ssl/ssl_fork_server.c
View File

@ -276,8 +276,7 @@ int main( void )
ssl_set_rng( &ssl, ctr_drbg_random, &ctr_drbg ); ssl_set_rng( &ssl, ctr_drbg_random, &ctr_drbg );
ssl_set_dbg( &ssl, my_debug, stdout ); ssl_set_dbg( &ssl, my_debug, stdout );
ssl_set_bio( &ssl, net_recv, &client_fd, ssl_set_bio_timeout( &ssl, &client_fd, net_send, net_recv, NULL, 0 );
net_send, &client_fd );
ssl_set_ca_chain( &ssl, srvcert.next, NULL, NULL ); ssl_set_ca_chain( &ssl, srvcert.next, NULL, NULL );
if( ( ret = ssl_set_own_cert( &ssl, &srvcert, &pkey ) ) != 0 ) if( ( ret = ssl_set_own_cert( &ssl, &srvcert, &pkey ) ) != 0 )

3
programs/ssl/ssl_mail_client.c
View File

@ -613,8 +613,7 @@ int main( int argc, char *argv[] )
ssl_set_rng( &ssl, ctr_drbg_random, &ctr_drbg ); ssl_set_rng( &ssl, ctr_drbg_random, &ctr_drbg );
ssl_set_dbg( &ssl, my_debug, stdout ); ssl_set_dbg( &ssl, my_debug, stdout );
ssl_set_bio( &ssl, net_recv, &server_fd, ssl_set_bio_timeout( &ssl, &server_fd, net_send, net_recv, NULL, 0 );
net_send, &server_fd );
if( opt.force_ciphersuite[0] != DFL_FORCE_CIPHER ) if( opt.force_ciphersuite[0] != DFL_FORCE_CIPHER )
ssl_set_ciphersuites( &ssl, opt.force_ciphersuite ); ssl_set_ciphersuites( &ssl, opt.force_ciphersuite );

3
programs/ssl/ssl_pthread_server.c
View File

@ -197,8 +197,7 @@ static void *handle_ssl_connection( void *data )
polarssl_printf( " [ #%d ] ok\n", thread_id ); polarssl_printf( " [ #%d ] ok\n", thread_id );
ssl_set_bio( &ssl, net_recv, &client_fd, ssl_set_bio_timeout( &ssl, &client_fd, net_send, net_recv, NULL, 0 );
net_send, &client_fd );
polarssl_printf( " [ #%d ] ok\n", thread_id ); polarssl_printf( " [ #%d ] ok\n", thread_id );

3
programs/ssl/ssl_server.c
View File

@ -251,8 +251,7 @@ reset:
goto exit; goto exit;
} }
ssl_set_bio( &ssl, net_recv, &client_fd, ssl_set_bio_timeout( &ssl, &client_fd, net_send, net_recv, NULL, 0 );
net_send, &client_fd );
polarssl_printf( " ok\n" ); polarssl_printf( " ok\n" );

3
programs/x509/cert_app.c
View File

@ -439,8 +439,7 @@ int main( int argc, char *argv[] )
ssl_set_rng( &ssl, ctr_drbg_random, &ctr_drbg ); ssl_set_rng( &ssl, ctr_drbg_random, &ctr_drbg );
ssl_set_dbg( &ssl, my_debug, stdout ); ssl_set_dbg( &ssl, my_debug, stdout );
ssl_set_bio( &ssl, net_recv, &server_fd, ssl_set_bio_timeout( &ssl, &server_fd, net_send, net_recv, NULL, 0 );
net_send, &server_fd );
if( ( ret = ssl_set_own_cert( &ssl, &clicert, &pkey ) ) != 0 ) if( ( ret = ssl_set_own_cert( &ssl, &clicert, &pkey ) ) != 0 )
{ {