Switch renego define from disable to enable

This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-09 16:23:15 +00:00
parent 9db41f0996
commit 55f968b2c9
6 changed files with 3 additions and 15 deletions

View File

@ -19,7 +19,6 @@
/* mbed TLS feature support */ /* mbed TLS feature support */
#define POLARSSL_KEY_EXCHANGE_PSK_ENABLED #define POLARSSL_KEY_EXCHANGE_PSK_ENABLED
#define POLARSSL_SSL_PROTO_TLS1_2 #define POLARSSL_SSL_PROTO_TLS1_2
#define POLARSSL_SSL_DISABLE_RENEGOTIATION
/* mbed TLS modules */ /* mbed TLS modules */
#define POLARSSL_AES_C #define POLARSSL_AES_C

View File

@ -18,7 +18,6 @@
#define POLARSSL_PKCS1_V15 #define POLARSSL_PKCS1_V15
#define POLARSSL_KEY_EXCHANGE_RSA_ENABLED #define POLARSSL_KEY_EXCHANGE_RSA_ENABLED
#define POLARSSL_SSL_PROTO_TLS1_1 #define POLARSSL_SSL_PROTO_TLS1_1
#define POLARSSL_SSL_DISABLE_RENEGOTIATION
/* mbed TLS modules */ /* mbed TLS modules */
#define POLARSSL_AES_C #define POLARSSL_AES_C

View File

@ -19,7 +19,6 @@
/* mbed TLS feature support */ /* mbed TLS feature support */
#define POLARSSL_KEY_EXCHANGE_PSK_ENABLED #define POLARSSL_KEY_EXCHANGE_PSK_ENABLED
#define POLARSSL_SSL_PROTO_TLS1 #define POLARSSL_SSL_PROTO_TLS1
#define POLARSSL_SSL_DISABLE_RENEGOTIATION
/* mbed TLS modules */ /* mbed TLS modules */
#define POLARSSL_AES_C #define POLARSSL_AES_C

View File

@ -25,7 +25,6 @@
#define POLARSSL_ECP_DP_SECP384R1_ENABLED #define POLARSSL_ECP_DP_SECP384R1_ENABLED
#define POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED #define POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
#define POLARSSL_SSL_PROTO_TLS1_2 #define POLARSSL_SSL_PROTO_TLS1_2
#define POLARSSL_SSL_DISABLE_RENEGOTIATION
/* mbed TLS modules */ /* mbed TLS modules */
#define POLARSSL_AES_C #define POLARSSL_AES_C

View File

@ -911,7 +911,7 @@
#define POLARSSL_SSL_CBC_RECORD_SPLITTING #define POLARSSL_SSL_CBC_RECORD_SPLITTING
/** /**
* \def POLARSSL_SSL_DISABLE_RENEGOTIATION * \def POLARSSL_SSL_RENEGOTIATION
* *
* Disable support for TLS renegotiation. * Disable support for TLS renegotiation.
* *
@ -921,12 +921,9 @@
* it has been associated with security issues in the past and is easy to * it has been associated with security issues in the past and is easy to
* misuse/misunderstand. * misuse/misunderstand.
* *
* Warning: in the next stable branch, this switch will be replaced by * Comment this to disable support for renegotiation.
* POLARSSL_SSL_RENEGOTIATION to enable support for renegotiation.
*
* Uncomment this to disable support for renegotiation.
*/ */
//#define POLARSSL_SSL_DISABLE_RENEGOTIATION #define POLARSSL_SSL_RENEGOTIATION
/** /**
* \def POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO * \def POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO

View File

@ -30,11 +30,6 @@
#include POLARSSL_CONFIG_FILE #include POLARSSL_CONFIG_FILE
#endif #endif
/* Temporary compatibility trick for the current stable branch */
#if !defined(POLARSSL_SSL_DISABLE_RENEGOTIATION)
#define POLARSSL_SSL_RENEGOTIATION
#endif
#include "net.h" #include "net.h"
#include "bignum.h" #include "bignum.h"
#include "ecp.h" #include "ecp.h"