yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 23:05:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Misc minor fixes

Browse Source 
- avoid "multi-line comment" warning in ssl_client2.c
- rm useless initialisation of mfl_code in ssl_init()
- const-correctness of ssl_parse_*_ext()
- a code formating issue
This commit is contained in:
Manuel Pégourié-Gonnard 2013-07-19 12:47:00 +02:00
parent 0c017a55e0
commit e048b67d0a
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/polarssl/ssl.h
View File

@ -118,7 +118,7 @@
#define SSL_MINOR_VERSION_3 3 /*!< TLS v1.2 */ #define SSL_MINOR_VERSION_3 3 /*!< TLS v1.2 */
/* RFC 6066 section 4, see also mfl_code_to_length in ssl_tls.c /* RFC 6066 section 4, see also mfl_code_to_length in ssl_tls.c
* NONE must be zero so that memset()ing session to zero works */ * NONE must be zero so that memset()ing structure to zero works */
#define SSL_MAX_FRAG_LEN_NONE 0 /*!< don't use this extension */ #define SSL_MAX_FRAG_LEN_NONE 0 /*!< don't use this extension */
#define SSL_MAX_FRAG_LEN_512 1 /*!< MaxFragmentLength 2^9 */ #define SSL_MAX_FRAG_LEN_512 1 /*!< MaxFragmentLength 2^9 */
#define SSL_MAX_FRAG_LEN_1024 2 /*!< MaxFragmentLength 2^10 */ #define SSL_MAX_FRAG_LEN_1024 2 /*!< MaxFragmentLength 2^10 */

4
library/ssl_cli.c
View File

@ -488,7 +488,7 @@ static int ssl_write_client_hello( ssl_context *ssl )
} }
static int ssl_parse_renegotiation_info( ssl_context *ssl, static int ssl_parse_renegotiation_info( ssl_context *ssl,
unsigned char *buf, const unsigned char *buf,
size_t len ) size_t len )
{ {
int ret; int ret;
@ -527,7 +527,7 @@ static int ssl_parse_renegotiation_info( ssl_context *ssl,
return( 0 ); return( 0 );
} }
static int ssl_parse_max_fragment_length_ext( ssl_context *ssl, static int ssl_parse_max_fragment_length_ext( ssl_context *ssl,
unsigned char *buf, const unsigned char *buf,
size_t len ) size_t len )
{ {
/* /*

3
library/ssl_srv.c
View File

@ -992,7 +992,8 @@ static void ssl_write_max_fragment_length_ext( ssl_context *ssl,
{ {
unsigned char *p = buf; unsigned char *p = buf;
if( ssl->session_negotiate->mfl_code == SSL_MAX_FRAG_LEN_NONE ) { if( ssl->session_negotiate->mfl_code == SSL_MAX_FRAG_LEN_NONE )
{
*olen = 0; *olen = 0;
return; return;
} }

2
library/ssl_tls.c
View File

@ -2843,8 +2843,6 @@ int ssl_init( ssl_context *ssl )
memset( ssl-> in_ctr, 0, SSL_BUFFER_LEN ); memset( ssl-> in_ctr, 0, SSL_BUFFER_LEN );
memset( ssl->out_ctr, 0, SSL_BUFFER_LEN ); memset( ssl->out_ctr, 0, SSL_BUFFER_LEN );
ssl->mfl_code = SSL_MAX_FRAG_LEN_NONE;
ssl->hostname = NULL; ssl->hostname = NULL;
ssl->hostname_len = 0; ssl->hostname_len = 0;

7
programs/ssl/ssl_client2.c
View File

@ -59,8 +59,7 @@
#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
/* Uncomment to test sending longer paquets (for fragmentation purposes) */ #define LONG_HEADER "User-agent: blah-blah-blah-blah-blah-blah-blah-blah-" \
#define LONG_HEADER // "User-agent: blah-blah-blah-blah-blah-blah-blah-" \
"-01--blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-" \ "-01--blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-" \
"-02--blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-" \ "-02--blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-" \
"-03--blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-" \ "-03--blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-" \
@ -69,7 +68,9 @@
"-06--blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-" \ "-06--blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-" \
"-07--blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-END\r\n" "-07--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" /* Uncomment LONG_HEADER in the definition of GET_REQUEST to test sending
* longer paquets (for fragmentation purposes) */
#define GET_REQUEST "GET %s HTTP/1.0\r\n" /* LONG_HEADER */ "\r\n"
/* /*
* global options * global options