yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-24 12:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add IO wrappers to ssl_client2 as interm's between NET and SSL layer

Browse source
This commit is contained in:
Hanno Becker 2019-07-03 17:02:43 +01:00 committed by Jarno Lamsa
parent 02f2609551
commit 14219feb27
1 changed files with 74 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
programs/ssl/ssl_client2.c
View file

@ -490,7 +490,8 @@ static void my_debug( void *ctx, int level,
* Test recv/send functions that make sure each try returns * Test recv/send functions that make sure each try returns
* WANT_READ/WANT_WRITE at least once before sucesseding * WANT_READ/WANT_WRITE at least once before sucesseding
*/ */
static int my_recv( void *ctx, unsigned char *buf, size_t len )
static int delayed_recv( void *ctx, unsigned char *buf, size_t len )
{ {
static int first_try = 1; static int first_try = 1;
int ret; int ret;
@ -507,7 +508,7 @@ static int my_recv( void *ctx, unsigned char *buf, size_t len )
return( ret ); return( ret );
} }
static int my_send( void *ctx, const unsigned char *buf, size_t len ) static int delayed_send( void *ctx, const unsigned char *buf, size_t len )
{ {
static int first_try = 1; static int first_try = 1;
int ret; int ret;
@ -527,6 +528,70 @@ static int my_send( void *ctx, const unsigned char *buf, size_t len )
MBEDTLS_SSL_CONF_SEND && MBEDTLS_SSL_CONF_SEND &&
MBEDTLS_SSL_CONF_RECV_TIMEOUT */ MBEDTLS_SSL_CONF_RECV_TIMEOUT */
typedef struct
{
mbedtls_ssl_context *ssl;
mbedtls_net_context *net;
} io_ctx_t;
static int recv_cb( void *ctx, unsigned char *buf, size_t len )
{
io_ctx_t *io_ctx = (io_ctx_t*) ctx;
size_t recv_len;
int ret;
if( opt.nbio == 2 )
ret = delayed_recv( io_ctx->net, buf, len );
else
ret = mbedtls_net_recv( io_ctx->net, buf, len );
if( ret < 0 )
return( ret );
recv_len = (size_t) ret;
if( opt.transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM )
{
/* Here's the place to do any datagram/record checking
* in between receiving the packet from the underlying
* transport and passing it on to the TLS stack. */
mbedtls_printf( "[RECV] Datagram of size %u\n", (unsigned) recv_len );
}
return( (int) recv_len );
}
static int recv_timeout_cb( void *ctx, unsigned char *buf, size_t len,
uint32_t timeout )
{
io_ctx_t *io_ctx = (io_ctx_t*) ctx;
int ret;
size_t recv_len;
ret = mbedtls_net_recv_timeout( io_ctx->net, buf, len, timeout );
if( ret < 0 )
return( ret );
recv_len = (size_t) ret;
if( opt.transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM )
{
/* Here's the place to do any datagram/record checking
* in between receiving the packet from the underlying
* transport and passing it on to the TLS stack. */
mbedtls_printf( "[RECV] Datagram of size %u\n", (unsigned) recv_len );
}
return( (int) recv_len );
}
static int send_cb( void *ctx, unsigned char const *buf, size_t len )
{
io_ctx_t *io_ctx = (io_ctx_t*) ctx;
if( opt.nbio == 2 )
return( delayed_send( io_ctx->net, buf, len ) );
return( mbedtls_net_send( io_ctx->net, buf, len ) );
}
#if defined(MBEDTLS_X509_CRT_PARSE_C) #if defined(MBEDTLS_X509_CRT_PARSE_C)
static unsigned char peer_crt_info[1024]; static unsigned char peer_crt_info[1024];
@ -761,6 +826,7 @@ int main( int argc, char *argv[] )
{ {
int ret = 0, len, tail_len, i, written, frags, retry_left; int ret = 0, len, tail_len, i, written, frags, retry_left;
mbedtls_net_context server_fd; mbedtls_net_context server_fd;
io_ctx_t io_ctx;
unsigned char buf[MAX_REQUEST_SIZE + 1]; unsigned char buf[MAX_REQUEST_SIZE + 1];
@ -1928,12 +1994,10 @@ int main( int argc, char *argv[] )
#if !defined(MBEDTLS_SSL_CONF_RECV) && \ #if !defined(MBEDTLS_SSL_CONF_RECV) && \
!defined(MBEDTLS_SSL_CONF_SEND) && \ !defined(MBEDTLS_SSL_CONF_SEND) && \
!defined(MBEDTLS_SSL_CONF_RECV_TIMEOUT) !defined(MBEDTLS_SSL_CONF_RECV_TIMEOUT)
if( opt.nbio == 2 ) io_ctx.ssl = &ssl;
mbedtls_ssl_set_bio( &ssl, &server_fd, my_send, my_recv, NULL ); io_ctx.net = &server_fd;
else mbedtls_ssl_set_bio( &ssl, &io_ctx, send_cb, recv_cb,
mbedtls_ssl_set_bio( &ssl, &server_fd, opt.nbio == 0 ? recv_timeout_cb : NULL );
mbedtls_net_send, mbedtls_net_recv,
opt.nbio == 0 ? mbedtls_net_recv_timeout : NULL );
#else #else
mbedtls_ssl_set_bio_ctx( &ssl, &server_fd ); mbedtls_ssl_set_bio_ctx( &ssl, &server_fd );
#endif #endif
@ -2550,13 +2614,8 @@ send_request:
goto exit; goto exit;
} }
if( opt.nbio == 2 ) mbedtls_ssl_set_bio( &ssl, &io_ctx, send_cb, recv_cb,
mbedtls_ssl_set_bio( &ssl, &server_fd, my_send, my_recv, opt.nbio == 0 ? recv_timeout_cb : NULL );
NULL );
else
mbedtls_ssl_set_bio( &ssl, &server_fd, mbedtls_net_send,
mbedtls_net_recv,
opt.nbio == 0 ? mbedtls_net_recv_timeout : NULL );
#if defined(MBEDTLS_TIMING_C) #if defined(MBEDTLS_TIMING_C)
#if !defined(MBEDTLS_SSL_CONF_SET_TIMER) && \ #if !defined(MBEDTLS_SSL_CONF_SET_TIMER) && \