Add some fixes for Travis failures

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3926)

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 329a8007eea6284185105bf8466b141ab3caab60..cb7b211f7cf2cf3cf1b16364460f97b6e3cfa7bd 100644 (file)
--- 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 1ff0f5e31b1399b86c70aa33f7c3442a90d1aec4..10869cf15f02e93353e918e9cdfeb3d1fde9c3e1 100644 (file)
--- 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"