From 27e36d342c525d7fc2923acf2cdd069d5aa54838 Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Tue, 8 Apr 2014 12:33:37 +0200 Subject: [PATCH] Support for the ALPN SSL extension (re-enabled in config.h) --- ChangeLog | 5 +++++ include/polarssl/config.h | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e2d97be5..6d4228f1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ PolarSSL ChangeLog (Sorted per branch, date) +ABI Alert: ALPN changes the ABI for the next release. + = PolarSSL 1.3 branch +Features + * Support for the ALPN SSL extension + Changes * x509_crt_info() now prints information about parsed extensions as well diff --git a/include/polarssl/config.h b/include/polarssl/config.h index f6ea78cdd..223fce382 100644 --- a/include/polarssl/config.h +++ b/include/polarssl/config.h @@ -866,12 +866,9 @@ * Enable support for Application Layer Protocol Negotiation. * draft-ietf-tls-applayerprotoneg-05 * - * This is disabled by default in the 1.3.x line since it breaks ABI - * compatibility. - * - * Uncomment this macro to enable support for ALPN. + * Comment this macro to disable support for ALPN. */ -//#define POLARSSL_SSL_ALPN +#define POLARSSL_SSL_ALPN /** * \def POLARSSL_SSL_SESSION_TICKETS