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

Fix a few internal name choices

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-03 16:41:52 +02:00
parent df791a51f6
commit 6c7af4c200
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
programs/ssl/ssl_server2.c
View file

@ -37,7 +37,7 @@
#endif #endif
#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION) && defined(POLARSSL_FS_IO) #if defined(POLARSSL_SSL_SERVER_NAME_INDICATION) && defined(POLARSSL_FS_IO)
#define POLARSSL_SNI #define SNI_OPTION
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
@ -195,13 +195,13 @@
#define USAGE_CACHE "" #define USAGE_CACHE ""
#endif /* POLARSSL_SSL_CACHE_C */ #endif /* POLARSSL_SSL_CACHE_C */
#if defined(POLARSSL_SNI) #if defined(SNI_OPTION)
#define USAGE_SNI \ #define USAGE_SNI \
" sni=%%s name1,cert1,key1[,name2,cert2,key2[,...]]\n" \ " sni=%%s name1,cert1,key1[,name2,cert2,key2[,...]]\n" \
" default: disabled\n" " default: disabled\n"
#else #else
#define USAGE_SNI "" #define USAGE_SNI ""
#endif /* POLARSSL_SNI */ #endif /* SNI_OPTION */
#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH) #if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
#define USAGE_MAX_FRAG_LEN \ #define USAGE_MAX_FRAG_LEN \
@ -445,7 +445,7 @@ static int my_send( void *ctx, const unsigned char *buf, size_t len )
goto error; \ goto error; \
*p++ = '\0'; *p++ = '\0';
#if defined(POLARSSL_SNI) #if defined(SNI_OPTION)
typedef struct _sni_entry sni_entry; typedef struct _sni_entry sni_entry;
struct _sni_entry { struct _sni_entry {
@ -556,7 +556,7 @@ int sni_callback( void *p_info, ssl_context *ssl,
return( -1 ); return( -1 );
} }
#endif /* POLARSSL_SNI */ #endif /* SNI_OPTION */
#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED) #if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
@ -739,7 +739,7 @@ int main( int argc, char *argv[] )
#if defined(POLARSSL_SSL_CACHE_C) #if defined(POLARSSL_SSL_CACHE_C)
ssl_cache_context cache; ssl_cache_context cache;
#endif #endif
#if defined(POLARSSL_SNI) #if defined(SNI_OPTION)
sni_entry *sni_info = NULL; sni_entry *sni_info = NULL;
#endif #endif
#if defined(POLARSSL_SSL_ALPN) #if defined(POLARSSL_SSL_ALPN)
@ -1476,7 +1476,7 @@ int main( int argc, char *argv[] )
} }
#endif #endif
#if defined(POLARSSL_SNI) #if defined(SNI_OPTION)
if( opt.sni != NULL ) if( opt.sni != NULL )
{ {
polarssl_printf( " . Setting up SNI information..." ); polarssl_printf( " . Setting up SNI information..." );
@ -1490,7 +1490,7 @@ int main( int argc, char *argv[] )
polarssl_printf( " ok\n" ); polarssl_printf( " ok\n" );
} }
#endif /* POLARSSL_SNI */ #endif /* SNI_OPTION */
/* /*
* 2. Setup the listening TCP socket * 2. Setup the listening TCP socket
@ -1693,7 +1693,7 @@ int main( int argc, char *argv[] )
} }
#endif #endif
#if defined(POLARSSL_SNI) #if defined(SNI_OPTION)
if( opt.sni != NULL ) if( opt.sni != NULL )
ssl_set_sni( &ssl, sni_callback, sni_info ); ssl_set_sni( &ssl, sni_callback, sni_info );
#endif #endif
@ -2201,7 +2201,7 @@ exit:
x509_crt_free( &srvcert2 ); x509_crt_free( &srvcert2 );
pk_free( &pkey2 ); pk_free( &pkey2 );
#endif #endif
#if defined(POLARSSL_SNI) #if defined(SNI_OPTION)
sni_free( sni_info ); sni_free( sni_info );
#endif #endif
#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED) #if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)

2
tests/suites/test_suite_ecp.data
View file

@ -169,7 +169,7 @@ ecp_check_pub_mx:POLARSSL_ECP_DP_M255:"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
ECP write binary #0 (zero, bad format) ECP write binary #0 (zero, bad format)
depends_on:POLARSSL_ECP_DP_SECP192R1_ENABLED depends_on:POLARSSL_ECP_DP_SECP192R1_ENABLED
ecp_write_binary:POLARSSL_ECP_DP_SECP192R1:"01":"01":"00":POLARSSL_ECP_PF_UNKNOWN:"00":1:POLARSSL_ERR_ECP_BAD_INPUT_DATA ecp_write_binary:POLARSSL_ECP_DP_SECP192R1:"01":"01":"00":ECP_PF_UNKNOWN:"00":1:POLARSSL_ERR_ECP_BAD_INPUT_DATA
ECP write binary #1 (zero, uncompressed, buffer just fits) ECP write binary #1 (zero, uncompressed, buffer just fits)
depends_on:POLARSSL_ECP_DP_SECP192R1_ENABLED depends_on:POLARSSL_ECP_DP_SECP192R1_ENABLED

2
tests/suites/test_suite_ecp.function
View file

@ -1,7 +1,7 @@
/* BEGIN_HEADER */ /* BEGIN_HEADER */
#include "mbedtls/ecp.h" #include "mbedtls/ecp.h"
#define POLARSSL_ECP_PF_UNKNOWN -1 #define ECP_PF_UNKNOWN -1
/* END_HEADER */ /* END_HEADER */
/* BEGIN_DEPENDENCIES /* BEGIN_DEPENDENCIES