yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement max_frag_len write restriction

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2013-07-16 15:43:17 +02:00
parent 0df6b1f068
commit 787b658bb3
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/ssl_tls.c
View file

@ -3416,8 +3416,8 @@ int ssl_write( ssl_context *ssl, const unsigned char *buf, size_t len )
} }
} }
n = ( len < SSL_MAX_CONTENT_LEN ) n = ( len < ssl->max_frag_len )
? len : SSL_MAX_CONTENT_LEN; ? len : ssl->max_frag_len;
if( ssl->out_left != 0 ) if( ssl->out_left != 0 )
{ {

22
programs/ssl/ssl_client2.c
View file

@ -59,7 +59,10 @@
#define DFL_AUTH_MODE SSL_VERIFY_OPTIONAL #define DFL_AUTH_MODE SSL_VERIFY_OPTIONAL
#define DFL_MFL_CODE SSL_MAX_FRAG_LEN_NONE #define DFL_MFL_CODE SSL_MAX_FRAG_LEN_NONE
#define GET_REQUEST "GET %s HTTP/1.0\r\n\r\n" /* Uncomment to test sending long paquets */
#define LONG_HEADER // "User-agent: blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-END\r\n"
#define GET_REQUEST "GET %s HTTP/1.0\r\n" LONG_HEADER "\r\n"
/* /*
* global options * global options
@ -201,7 +204,7 @@ int main( int argc, char *argv[] )
#else #else
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
int ret = 0, len, server_fd, i; int ret = 0, len, server_fd, i, written;
unsigned char buf[1024]; unsigned char buf[1024];
#if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED) #if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED)
unsigned char psk[256]; unsigned char psk[256];
@ -702,17 +705,20 @@ int main( int argc, char *argv[] )
len = sprintf( (char *) buf, GET_REQUEST, opt.request_page ); len = sprintf( (char *) buf, GET_REQUEST, opt.request_page );
while( ( ret = ssl_write( &ssl, buf, len ) ) <= 0 ) for( written = 0; written < len; written += ret )
{ {
if( ret != POLARSSL_ERR_NET_WANT_READ && ret != POLARSSL_ERR_NET_WANT_WRITE ) while( ( ret = ssl_write( &ssl, buf + written, len - written ) ) <= 0 )
{ {
printf( " failed\n ! ssl_write returned -0x%x\n\n", -ret ); if( ret != POLARSSL_ERR_NET_WANT_READ && ret != POLARSSL_ERR_NET_WANT_WRITE )
goto exit; {
printf( " failed\n ! ssl_write returned -0x%x\n\n", -ret );
goto exit;
}
} }
} }
len = ret; buf[written] = '\0';
printf( " %d bytes written\n\n%s", len, (char *) buf ); printf( " %d bytes written\n\n%s\n", written, (char *) buf );
/* /*
* 7. Read the HTTP response * 7. Read the HTTP response