Deprecate using NET_C without HAVE_IPV6

This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-09 14:40:46 +02:00
parent 8c3f0f4c16
commit a98af5e2b2
5 changed files with 18 additions and 2 deletions

View File

@ -43,6 +43,7 @@ Bugfix
curve picked by the server was actually allowed. curve picked by the server was actually allowed.
Changes Changes
* Enabling POLARSSL_NET_C without POLARSSL_HAVE_IPV6 is deprecated.
* compat-1.2.h and openssl.h are deprecated. * compat-1.2.h and openssl.h are deprecated.
* Adjusting/overriding CFLAGS and LDFLAGS with the make build syste is now * Adjusting/overriding CFLAGS and LDFLAGS with the make build syste is now
more flexible (warning: OFLAGS is not used any more) (see the README) more flexible (warning: OFLAGS is not used any more) (see the README)

View File

@ -12,7 +12,7 @@
#define POLARSSL_CONFIG_H #define POLARSSL_CONFIG_H
/* System support */ /* System support */
//#define POLARSSL_HAVE_IPV6 /* Optional */ #define POLARSSL_HAVE_IPV6 /* Now mandatory for NET_C */
//#define POLARSSL_HAVE_TIME /* Optionally used in Hello messages */ //#define POLARSSL_HAVE_TIME /* Optionally used in Hello messages */
/* Other POLARSSL_HAVE_XXX flags irrelevant for this configuration */ /* Other POLARSSL_HAVE_XXX flags irrelevant for this configuration */

View File

@ -12,7 +12,7 @@
#define POLARSSL_CONFIG_H #define POLARSSL_CONFIG_H
/* System support */ /* System support */
//#define POLARSSL_HAVE_IPV6 /* Optional */ #define POLARSSL_HAVE_IPV6 /* Now mandatory for NET_C */
//#define POLARSSL_HAVE_TIME /* Optionnaly used in Hello messages */ //#define POLARSSL_HAVE_TIME /* Optionnaly used in Hello messages */
/* Other POLARSSL_HAVE_XXX flags irrelevant for this configuration */ /* Other POLARSSL_HAVE_XXX flags irrelevant for this configuration */

View File

@ -35,6 +35,15 @@
#error "POLARSSL_DEPRECATED_WARNING only works with GCC and Clang" #error "POLARSSL_DEPRECATED_WARNING only works with GCC and Clang"
#endif #endif
#if defined(POLARSSL_NET_C) && !defined(POLARSSL_HAVE_IPV6)
#if defined(POLARSSL_DEPRECATED_WARNING)
#warning "Using POLARSSL_NET_C without POLARSSL_HAVE_IPV6 is deprecated"
#endif
#if defined(POLARSSL_DEPRECATED_REMOVED)
#define POLARSSL_HAVE_IPV6
#endif
#endif /* POLARSSL_NET_C && !POLARSSL_HAVE_IPV6 */
#if defined(POLARSSL_AESNI_C) && !defined(POLARSSL_HAVE_ASM) #if defined(POLARSSL_AESNI_C) && !defined(POLARSSL_HAVE_ASM)
#error "POLARSSL_AESNI_C defined, but not all prerequisites" #error "POLARSSL_AESNI_C defined, but not all prerequisites"
#endif #endif

View File

@ -107,6 +107,9 @@
* *
* Note: on Windows/MingW, XP or higher is required. * Note: on Windows/MingW, XP or higher is required.
* *
* \warning As of 1.3.11, *not* using this flag when POLARSSL_NET_C is
* defined, is deprecated. The alternative legacy code will be removed in 2.0.
*
* Comment if your system does not support the IPv6 socket interface * Comment if your system does not support the IPv6 socket interface
*/ */
#define POLARSSL_HAVE_IPV6 #define POLARSSL_HAVE_IPV6
@ -1757,6 +1760,9 @@
* *
* Enable the TCP/IP networking routines. * Enable the TCP/IP networking routines.
* *
* \warning As of 1.3.11, it is deprecated to enable this module without
* POLARSSL_HAVE_IPV6. The alternative legacy code will be removed in 2.0.
*
* Module: library/net.c * Module: library/net.c
* *
* This module provides TCP/IP networking routines. * This module provides TCP/IP networking routines.