Commit fff202e5 authored by Matt Caswell's avatar Matt Caswell
Browse files

Add some fixes for Travis failures 



Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3926)
parent 976e5323

ssl/statem/extensions_clnt.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

test/sslapitest.c

+2 −2
Original line number Diff line number Diff line
@@ -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"