From c1136a30e9b70bebf681bf755d467d348ddd4e26 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Mon, 12 Sep 2016 09:42:42 -0700 Subject: [PATCH] 1. Enabled the extended master secret in the Windows IDE user_settings.h file by default. 2. Fixed scan-build warning about an assignment to a variable that isn't used again in the function. Commented out the line. --- IDE/WIN/user_settings.h | 1 + src/internal.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/IDE/WIN/user_settings.h b/IDE/WIN/user_settings.h index 30ec8f000..a3146861f 100755 --- a/IDE/WIN/user_settings.h +++ b/IDE/WIN/user_settings.h @@ -28,6 +28,7 @@ #define WOLFSSL_RIPEMD #define WOLFSSL_SHA512 #define NO_PSK + #define HAVE_EXTENDED_MASTER #define WOLFSSL_SNIFFER #else /* The servers and clients */ diff --git a/src/internal.c b/src/internal.c index 2c3895f16..e9b6850cc 100755 --- a/src/internal.c +++ b/src/internal.c @@ -16164,7 +16164,9 @@ int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx, c16toa(HELLO_EXT_EXTMS, output + idx); idx += HELLO_EXT_TYPE_SZ; c16toa(0, output + idx); - idx += HELLO_EXT_SZ_SZ; + /*idx += HELLO_EXT_SZ_SZ;*/ + /* idx is not used after this point. uncomment the line above + * if adding any more extentions in the future. */ } #endif #endif