From 6a75c8d144970d9a5a0245706722e97524444e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moise=CC=81s=20Guimara=CC=83es?= Date: Mon, 29 Sep 2014 16:43:28 -0300 Subject: [PATCH] fix TURN_ON mask adds --enable-session-ticket configure option --- configure.ac | 13 +++++++++++++ src/tls.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index dbd2716fb..89e5d07b0 100644 --- a/configure.ac +++ b/configure.ac @@ -1357,6 +1357,18 @@ then AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_SUPPORTED_CURVES" fi +# Session Ticket Extension +AC_ARG_ENABLE([session-ticket], + [ --enable-session-ticket Enable Session Ticket (default: disabled)], + [ ENABLED_SESSION_TICKET=$enableval ], + [ ENABLED_SESSION_TICKET=no ] + ) + +if test "x$ENABLED_SESSION_TICKET" = "xyes" +then + AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_SESSION_TICKET" +fi + # TLS Extensions AC_ARG_ENABLE([tlsx], [ --enable-tlsx Enable all TLS Extensions (default: disabled)], @@ -1873,6 +1885,7 @@ echo " * Truncated HMAC: $ENABLED_TRUNCATED_HMAC" echo " * Renegotiation Indication: $ENABLED_RENEGOTIATION_INDICATION" echo " * Secure Renegotiation: $ENABLED_SECURE_RENEGOTIATION" echo " * Supported Elliptic Curves: $ENABLED_SUPPORTED_CURVES" +echo " * Session Ticket: $ENABLED_SESSION_TICKET" echo " * All TLS Extensions: $ENABLED_TLSX" echo " * PKCS#7 $ENABLED_PKCS7" echo " * wolfSCEP $ENABLED_WOLFSCEP" diff --git a/src/tls.c b/src/tls.c index 5f95a5319..06d1f53d9 100644 --- a/src/tls.c +++ b/src/tls.c @@ -735,7 +735,7 @@ static INLINE word16 TLSX_ToSemaphore(word16 type) #define TURN_ON(semaphore, light) \ - ((semaphore)[(light) / 8] |= (byte) (0xff01 << ((light) % 8))) + ((semaphore)[(light) / 8] |= (byte) (0x01 << ((light) % 8))) static int TLSX_Push(TLSX** list, TLSX_Type type, void* data)