From 27c3a70e1321bf866e394ff4363db5bca4c7bd6a Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Tue, 1 May 2018 15:19:18 +1000 Subject: [PATCH] Allow building TLS 1.3 at draft 26 --- configure.ac | 15 ++++++++++++++- wolfssl/internal.h | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c55936f83..c96e5ce2a 100644 --- a/configure.ac +++ b/configure.ac @@ -326,6 +326,18 @@ then fi +# TLS v1.3 Draft 26 +AC_ARG_ENABLE([tls13-draft26], + [AS_HELP_STRING([--enable-tls13-draft26],[Enable wolfSSL TLS v1.3 Draft 26 (default: disabled)])], + [ ENABLED_TLS13_DRAFT26=$enableval ], + [ ENABLED_TLS13_DRAFT26=no ] + ) +if test "$ENABLED_TLS13_DRAFT26" = "yes" +then + AM_CFLAGS="-DWOLFSSL_TLS13_DRAFT_26 $AM_CFLAGS" +fi + + # TLS v1.3 AC_ARG_ENABLE([tls13], [AS_HELP_STRING([--enable-tls13],[Enable wolfSSL TLS v1.3 (default: disabled)])], @@ -333,7 +345,7 @@ AC_ARG_ENABLE([tls13], [ ENABLED_TLS13=no ] ) -if test "$ENABLED_TLS13_DRAFT18" = "yes" || test "$ENABLED_TLS13_DRAFT22" = "yes" || test "$ENABLED_TLS13_DRAFT23" = "yes" +if test "$ENABLED_TLS13_DRAFT18" = "yes" || test "$ENABLED_TLS13_DRAFT22" = "yes" || test "$ENABLED_TLS13_DRAFT23" = "yes" || test "$ENABLED_TLS13_DRAFT26" = "yes" then ENABLED_TLS13="yes" fi @@ -4409,6 +4421,7 @@ echo " * TLS v1.3: $ENABLED_TLS13" echo " * TLS v1.3 Draft 18: $ENABLED_TLS13_DRAFT18" echo " * TLS v1.3 Draft 22: $ENABLED_TLS13_DRAFT22" echo " * TLS v1.3 Draft 23: $ENABLED_TLS13_DRAFT23" +echo " * TLS v1.3 Draft 26: $ENABLED_TLS13_DRAFT26" echo " * Post-handshake Auth: $ENABLED_TLS13_POST_AUTH" echo " * Early Data: $ENABLED_TLS13_EARLY_DATA" echo " * Send State in HRR Cookie: $ENABLED_SEND_HRR_COOKIE" diff --git a/wolfssl/internal.h b/wolfssl/internal.h index 8abcd899f..8c41a5893 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -1039,6 +1039,8 @@ enum Misc { TLS_DRAFT_MINOR = 0x16, /* Minor version number of TLS draft */ #elif defined(WOLFSSL_TLS13_DRAFT_23) TLS_DRAFT_MINOR = 0x17, /* Minor version number of TLS draft */ +#elif defined(WOLFSSL_TLS13_DRAFT_26) + TLS_DRAFT_MINOR = 0x1a, /* Minor version number of TLS draft */ #else TLS_DRAFT_MINOR = 0x1c, /* Minor version number of TLS draft */ #endif