Support for the ALPN SSL extension (re-enabled in config.h)

27e36d34 · Paul Bakker · 83d8c73c · 27e36d34 · 27e36d34
Commit 27e36d34 authored Apr 08, 2014 by Paul Bakker
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

ChangeLog ChangeLog +5 -0

include/polarssl/config.h include/polarssl/config.h +2 -5

No files found.
--- a/ChangeLog
+++ b/ChangeLog
 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


--- 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