Commit 71728dd8 authored by Matt Caswell's avatar Matt Caswell
Browse files

Send and Receive a TLSv1.3 format ServerHello 



There are some minor differences in the format of a ServerHello in TLSv1.3.

Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich
Salz

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent c901bcce

ssl/statem/statem_clnt.c

+27 −17
Original line number Diff line number Diff line
@@ -1089,6 +1089,7 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL *s, PACKET *pkt) 
    s->hit = 0;



    /* Get the session-id. */

    if (!SSL_IS_TLS13(s)) {

        if (!PACKET_get_length_prefixed_1(pkt, &session_id)) {

            al = SSL_AD_DECODE_ERROR;

            SSLerr(SSL_F_TLS_PROCESS_SERVER_HELLO, SSL_R_LENGTH_MISMATCH);
@@ -1098,9 +1099,13 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL *s, PACKET *pkt) 
        if (session_id_len > sizeof s->session->session_id

            || session_id_len > SSL3_SESSION_ID_SIZE) {

            al = SSL_AD_ILLEGAL_PARAMETER;

        SSLerr(SSL_F_TLS_PROCESS_SERVER_HELLO, SSL_R_SSL3_SESSION_ID_TOO_LONG);

            SSLerr(SSL_F_TLS_PROCESS_SERVER_HELLO,

                   SSL_R_SSL3_SESSION_ID_TOO_LONG);

            goto f_err;

        }

    } else {

        session_id_len = 0;

    }



    if (!PACKET_get_bytes(pkt, &cipherchars, TLS_CIPHER_LEN)) {

        SSLerr(SSL_F_TLS_PROCESS_SERVER_HELLO, SSL_R_LENGTH_MISMATCH);
@@ -1120,8 +1125,8 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL *s, PACKET *pkt) 
     * we can resume, and later peek at the next handshake message to see if the

     * server wants to resume.

     */

    if (s->version >= TLS1_VERSION && s->tls_session_secret_cb &&

        s->session->tlsext_tick) {

    if (s->version >= TLS1_VERSION && !SSL_IS_TLS13(s)

            && s->tls_session_secret_cb && s->session->tlsext_tick) {

        const SSL_CIPHER *pref_cipher = NULL;

        /*

         * s->session->master_key_length is a size_t, but this is an int for
@@ -1235,11 +1240,16 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL *s, PACKET *pkt) 
    s->s3->tmp.new_cipher = c;

    /* lets get the compression algorithm */

    /* COMPRESSION */

    if (!SSL_IS_TLS13(s)) {

        if (!PACKET_get_1(pkt, &compression)) {

            SSLerr(SSL_F_TLS_PROCESS_SERVER_HELLO, SSL_R_LENGTH_MISMATCH);

            al = SSL_AD_DECODE_ERROR;

            goto f_err;

        }

    } else {

        compression = 0;

    }



#ifdef OPENSSL_NO_COMP

    if (compression != 0) {

        al = SSL_AD_ILLEGAL_PARAMETER;

ssl/statem/statem_srvr.c

+4 −2
Original line number Diff line number Diff line
@@ -1773,9 +1773,11 @@ int tls_construct_server_hello(SSL *s, WPACKET *pkt) 
        compm = s->s3->tmp.new_compression->id;

#endif



    if (!WPACKET_sub_memcpy_u8(pkt, s->session->session_id, sl)

    if ((!SSL_IS_TLS13(s)

                && !WPACKET_sub_memcpy_u8(pkt, s->session->session_id, sl))

            || !s->method->put_cipher_by_char(s->s3->tmp.new_cipher, pkt, &len)

            || !WPACKET_put_bytes_u8(pkt, compm)

            || (!SSL_IS_TLS13(s)

                && !WPACKET_put_bytes_u8(pkt, compm))

            || !ssl_prepare_serverhello_tlsext(s)

            || !ssl_add_serverhello_tlsext(s, pkt, &al)) {

        SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_HELLO, ERR_R_INTERNAL_ERROR);

ssl/t1_trce.c

+21 −12
Original line number Diff line number Diff line
@@ -588,12 +588,17 @@ static int ssl_print_hexbuf(BIO *bio, int indent, 
}



static int ssl_print_version(BIO *bio, int indent, const char *name,

                             const unsigned char **pmsg, size_t *pmsglen)

                             const unsigned char **pmsg, size_t *pmsglen,

                             unsigned int *version)

{

    int vers;

    if (*pmsglen < 2)

        return 0;

    vers = ((*pmsg)[0] << 8) | (*pmsg)[1];

    if (version != NULL) {

        /* TODO(TLS1.3): Remove the draft conditional here before release */

        *version = (vers == TLS1_3_VERSION_DRAFT) ? TLS1_3_VERSION : vers;

    }

    BIO_indent(bio, indent, 80);

    BIO_printf(bio, "%s=0x%x (%s)\n",

               name, vers, ssl_trace_str(vers, ssl_version_tbl));
@@ -796,7 +801,7 @@ static int ssl_print_client_hello(BIO *bio, SSL *ssl, int indent, 
{

    size_t len;

    unsigned int cs;

    if (!ssl_print_version(bio, indent, "client_version", &msg, &msglen))

    if (!ssl_print_version(bio, indent, "client_version", &msg, &msglen, NULL))

        return 0;

    if (!ssl_print_random(bio, indent, &msg, &msglen))

        return 0;
@@ -849,7 +854,7 @@ static int ssl_print_client_hello(BIO *bio, SSL *ssl, int indent, 
static int dtls_print_hello_vfyrequest(BIO *bio, int indent,

                                       const unsigned char *msg, size_t msglen)

{

    if (!ssl_print_version(bio, indent, "server_version", &msg, &msglen))

    if (!ssl_print_version(bio, indent, "server_version", &msg, &msglen, NULL))

        return 0;

    if (!ssl_print_hexbuf(bio, indent, "cookie", 1, &msg, &msglen))

        return 0;
@@ -860,11 +865,13 @@ static int ssl_print_server_hello(BIO *bio, int indent, 
                                  const unsigned char *msg, size_t msglen)

{

    unsigned int cs;

    if (!ssl_print_version(bio, indent, "server_version", &msg, &msglen))

    unsigned int vers;

    if (!ssl_print_version(bio, indent, "server_version", &msg, &msglen, &vers))

        return 0;

    if (!ssl_print_random(bio, indent, &msg, &msglen))

        return 0;

    if (!ssl_print_hexbuf(bio, indent, "session_id", 1, &msg, &msglen))

    if (vers != TLS1_3_VERSION

            && !ssl_print_hexbuf(bio, indent, "session_id", 1, &msg, &msglen))

        return 0;

    if (msglen < 2)

        return 0;
@@ -874,6 +881,7 @@ static int ssl_print_server_hello(BIO *bio, int indent, 
               msg[0], msg[1], ssl_trace_str(cs, ssl_ciphers_tbl));

    msg += 2;

    msglen -= 2;

    if (vers != TLS1_3_VERSION) {

        if (msglen < 1)

            return 0;

        BIO_indent(bio, indent, 80);
@@ -881,6 +889,7 @@ static int ssl_print_server_hello(BIO *bio, int indent, 
                   ssl_trace_str(msg[0], ssl_comp_tbl), msg[0]);

        msg++;

        msglen--;

    }

    if (!ssl_print_extensions(bio, indent, 1, msg, msglen))

        return 0;

    return 1;

test/recipes/70-test_tls13messages.t

+7 −6
Original line number Diff line number Diff line
@@ -60,17 +60,18 @@ sub checkmessages($$); 


#Test 1: Check we get all the right messages for a default handshake

(undef, my $session) = tempfile();

$proxy->serverconnects(2);

#$proxy->serverconnects(2);

$proxy->clientflags("-sess_out ".$session);

$proxy->start() or plan skip_all => "Unable to start up Proxy for tests";

plan tests => 4;

plan tests => 3;

checkmessages(DEFAULT_HANDSHAKE, "Default handshake test");



#TODO(TLS1.3): Test temporarily disabled until we implement TLS1.3 resumption

#Test 2: Resumption handshake

$proxy->clearClient();

$proxy->clientflags("-sess_in ".$session);

$proxy->clientstart();

checkmessages(RESUME_HANDSHAKE, "Resumption handshake test");

#$proxy->clearClient();

#$proxy->clientflags("-sess_in ".$session);

#$proxy->clientstart();

#checkmessages(RESUME_HANDSHAKE, "Resumption handshake test");

unlink $session;



#Test 3: A default handshake, but with a CertificateStatus message

test/ssl-tests/09-alpn.conf

+8 −0
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[10-alpn-simple-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer
@@ -425,6 +426,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[11-alpn-server-switch-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer
@@ -465,11 +467,13 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[12-alpn-client-switch-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer



[12-alpn-client-switch-resumption-resume-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer
@@ -515,6 +519,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[13-alpn-alert-on-mismatch-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer
@@ -560,6 +565,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[14-alpn-no-server-support-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer
@@ -595,11 +601,13 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[15-alpn-no-client-support-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer



[15-alpn-no-client-support-resumption-resume-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer