From fff202e5f7312f60285a61592301189d35b8450e Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 3 Aug 2017 16:30:31 +0100 Subject: [PATCH] Add some fixes for Travis failures Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/3926) --- ssl/statem/extensions_clnt.c | 2 +- test/sslapitest.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c index 329a8007ee..cb7b211f7c 100644 --- a/ssl/statem/extensions_clnt.c +++ b/ssl/statem/extensions_clnt.c @@ -680,7 +680,7 @@ EXT_RETURN tls_construct_ctos_early_data(SSL *s, WPACKET *pkt, size_t chainidx, int *al) { const unsigned char *id; - size_t idlen; + size_t idlen = 0; SSL_SESSION *psksess = NULL; SSL_SESSION *edsess = NULL; const EVP_MD *handmd = NULL; diff --git a/test/sslapitest.c b/test/sslapitest.c index 1ff0f5e31b..10869cf15f 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -1399,6 +1399,8 @@ static int test_set_sigalgs(int idx) return testresult; } +#ifndef OPENSSL_NO_TLS1_3 + static SSL_SESSION *psk = NULL; static const char *pskid = "Identity"; static const char *srvid; @@ -1463,8 +1465,6 @@ static int find_session_cb(SSL *ssl, const unsigned char *identity, return 1; } -#ifndef OPENSSL_NO_TLS1_3 - #define MSG1 "Hello" #define MSG2 "World." #define MSG3 "This" -- 2.25.1