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

Rename macro to avoid possible future collision

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-09 11:17:30 +00:00
parent 2f5a1b4e55
commit ed99d70309
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/polarssl/ssl.h
View File

@ -368,7 +368,7 @@
* Signaling ciphersuite values (SCSV) * Signaling ciphersuite values (SCSV)
*/ */
#define SSL_EMPTY_RENEGOTIATION_INFO 0xFF /**< renegotiation info ext */ #define SSL_EMPTY_RENEGOTIATION_INFO 0xFF /**< renegotiation info ext */
#define SSL_FALLBACK_SCSV 0x5600 /**< draft-ietf-tls-downgrade-scsv-00 */ #define SSL_FALLBACK_SCSV_VALUE 0x5600 /**< draft-ietf-tls-downgrade-scsv-00 */
/* /*
* Supported Signature and Hash algorithms (For TLS 1.2) * Supported Signature and Hash algorithms (For TLS 1.2)

4
library/ssl_cli.c
View File

@ -736,8 +736,8 @@ static int ssl_write_client_hello( ssl_context *ssl )
if( ssl->fallback == SSL_IS_FALLBACK ) if( ssl->fallback == SSL_IS_FALLBACK )
{ {
SSL_DEBUG_MSG( 3, ( "adding FALLBACK_SCSV" ) ); SSL_DEBUG_MSG( 3, ( "adding FALLBACK_SCSV" ) );
*p++ = (unsigned char)( SSL_FALLBACK_SCSV >> 8 ); *p++ = (unsigned char)( SSL_FALLBACK_SCSV_VALUE >> 8 );
*p++ = (unsigned char)( SSL_FALLBACK_SCSV ); *p++ = (unsigned char)( SSL_FALLBACK_SCSV_VALUE );
n++; n++;
} }
#endif #endif

8
library/ssl_srv.c
View File

@ -1209,8 +1209,8 @@ static int ssl_parse_client_hello_v2( ssl_context *ssl )
for( i = 0, p = buf + 6; i < ciph_len; i += 3, p += 3 ) for( i = 0, p = buf + 6; i < ciph_len; i += 3, p += 3 )
{ {
if( p[0] == 0 && if( p[0] == 0 &&
p[1] == (unsigned char)( ( SSL_FALLBACK_SCSV >> 8 ) & 0xff ) && p[1] == (unsigned char)( ( SSL_FALLBACK_SCSV_VALUE >> 8 ) & 0xff ) &&
p[2] == (unsigned char)( ( SSL_FALLBACK_SCSV ) & 0xff ) ) p[2] == (unsigned char)( ( SSL_FALLBACK_SCSV_VALUE ) & 0xff ) )
{ {
SSL_DEBUG_MSG( 3, ( "received FALLBACK_SCSV" ) ); SSL_DEBUG_MSG( 3, ( "received FALLBACK_SCSV" ) );
@ -1913,8 +1913,8 @@ read_record_header:
#if defined(POLARSSL_SSL_FALLBACK_SCSV) #if defined(POLARSSL_SSL_FALLBACK_SCSV)
for( i = 0, p = buf + 41 + sess_len; i < ciph_len; i += 2, p += 2 ) for( i = 0, p = buf + 41 + sess_len; i < ciph_len; i += 2, p += 2 )
{ {
if( p[0] == (unsigned char)( ( SSL_FALLBACK_SCSV >> 8 ) & 0xff ) && if( p[0] == (unsigned char)( ( SSL_FALLBACK_SCSV_VALUE >> 8 ) & 0xff ) &&
p[1] == (unsigned char)( ( SSL_FALLBACK_SCSV ) & 0xff ) ) p[1] == (unsigned char)( ( SSL_FALLBACK_SCSV_VALUE ) & 0xff ) )
{ {
SSL_DEBUG_MSG( 0, ( "received FALLBACK_SCSV" ) ); SSL_DEBUG_MSG( 0, ( "received FALLBACK_SCSV" ) );