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

Add EncryptedExtensions message 



At this stage the message is just empty. We need to fill it in with
extension data.

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 71728dd8

include/openssl/ssl.h

+5 −1
Original line number Diff line number Diff line
@@ -883,7 +883,9 @@ typedef enum { 
    TLS_ST_SW_SESSION_TICKET,

    TLS_ST_SW_CERT_STATUS,

    TLS_ST_SW_CHANGE,

    TLS_ST_SW_FINISHED

    TLS_ST_SW_FINISHED,

    TLS_ST_SW_ENCRYPTED_EXTENSIONS,

    TLS_ST_CR_ENCRYPTED_EXTENSIONS

} OSSL_HANDSHAKE_STATE;



/*
@@ -2267,6 +2269,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLS_CONSTRUCT_CLIENT_HELLO                 356

# define SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE          357

# define SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY                358

# define SSL_F_TLS_CONSTRUCT_ENCRYPTED_EXTENSIONS         443

# define SSL_F_TLS_CONSTRUCT_FINISHED                     359

# define SSL_F_TLS_CONSTRUCT_HELLO_REQUEST                373

# define SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET           428
@@ -2293,6 +2296,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLS_PROCESS_CLIENT_CERTIFICATE             380

# define SSL_F_TLS_PROCESS_CLIENT_HELLO                   381

# define SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE            382

# define SSL_F_TLS_PROCESS_ENCRYPTED_EXTENSIONS           444

# define SSL_F_TLS_PROCESS_FINISHED                       364

# define SSL_F_TLS_PROCESS_INITIAL_SERVER_FLIGHT          442

# define SSL_F_TLS_PROCESS_KEY_EXCHANGE                   365

include/openssl/ssl3.h

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ extern "C" { 
# define SSL3_MT_CLIENT_HELLO                    1

# define SSL3_MT_SERVER_HELLO                    2

# define SSL3_MT_NEWSESSION_TICKET               4

# define SSL3_MT_ENCRYPTED_EXTENSIONS            8

# define SSL3_MT_CERTIFICATE                     11

# define SSL3_MT_SERVER_KEY_EXCHANGE             12

# define SSL3_MT_CERTIFICATE_REQUEST             13

ssl/ssl_err.c

+4 −0
Original line number Diff line number Diff line
@@ -273,6 +273,8 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
     "tls_construct_client_key_exchange"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY),

     "tls_construct_client_verify"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_ENCRYPTED_EXTENSIONS),

     "tls_construct_encrypted_extensions"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_FINISHED), "tls_construct_finished"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_HELLO_REQUEST),

     "tls_construct_hello_request"},
@@ -312,6 +314,8 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_TLS_PROCESS_CLIENT_HELLO), "tls_process_client_hello"},

    {ERR_FUNC(SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE),

     "tls_process_client_key_exchange"},

    {ERR_FUNC(SSL_F_TLS_PROCESS_ENCRYPTED_EXTENSIONS),

     "tls_process_encrypted_extensions"},

    {ERR_FUNC(SSL_F_TLS_PROCESS_FINISHED), "tls_process_finished"},

    {ERR_FUNC(SSL_F_TLS_PROCESS_INITIAL_SERVER_FLIGHT),

     "tls_process_initial_server_flight"},

ssl/statem/statem_clnt.c

+35 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ 
#include <openssl/bn.h>

#include <openssl/engine.h>



static MSG_PROCESS_RETURN tls_process_encrypted_extensions(SSL *s, PACKET *pkt);



static ossl_inline int cert_req_allowed(SSL *s);

static int key_exchange_expected(SSL *s);

static int ca_dn_cmp(const X509_NAME *const *a, const X509_NAME *const *b);
@@ -135,6 +137,13 @@ static int ossl_statem_client13_read_transition(SSL *s, int mt) 
        break;



    case TLS_ST_CR_SRVR_HELLO:

        if (mt == SSL3_MT_ENCRYPTED_EXTENSIONS) {

            st->hand_state = TLS_ST_CR_ENCRYPTED_EXTENSIONS;

            return 1;

        }

        break;



    case TLS_ST_CR_ENCRYPTED_EXTENSIONS:

        if (s->hit) {

            if (mt == SSL3_MT_FINISHED) {

                st->hand_state = TLS_ST_CR_FINISHED;
@@ -759,6 +768,9 @@ size_t ossl_statem_client_max_message_size(SSL *s) 


    case TLS_ST_CR_FINISHED:

        return FINISHED_MAX_LENGTH;



    case TLS_ST_CR_ENCRYPTED_EXTENSIONS:

        return ENCRYPTED_EXTENSIONS_MAX_LENGTH;

    }

}
@@ -803,6 +815,9 @@ MSG_PROCESS_RETURN ossl_statem_client_process_message(SSL *s, PACKET *pkt) 


    case TLS_ST_CR_FINISHED:

        return tls_process_finished(s, pkt);



    case TLS_ST_CR_ENCRYPTED_EXTENSIONS:

        return tls_process_encrypted_extensions(s, pkt);

    }

}
@@ -3083,6 +3098,26 @@ int tls_construct_next_proto(SSL *s, WPACKET *pkt) 
}

#endif



static MSG_PROCESS_RETURN tls_process_encrypted_extensions(SSL *s, PACKET *pkt)

{

    int al = SSL_AD_INTERNAL_ERROR;

    PACKET extensions;



    /* TODO(TLS1.3): We need to process these extensions. For now ignore them */

    if (!PACKET_as_length_prefixed_2(pkt, &extensions)) {

        al = SSL_AD_DECODE_ERROR;

        SSLerr(SSL_F_TLS_PROCESS_ENCRYPTED_EXTENSIONS, SSL_R_LENGTH_MISMATCH);

        goto err;

    }



    return MSG_PROCESS_CONTINUE_READING;



 err:

    ssl3_send_alert(s, SSL3_AL_FATAL, al);

    ossl_statem_set_error(s);

    return MSG_PROCESS_ERROR;

}



int ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey)

{

    int i = 0;

ssl/statem/statem_locl.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
/* The spec allows for a longer length than this, but we limit it */

#define HELLO_VERIFY_REQUEST_MAX_LENGTH 258

#define SERVER_HELLO_MAX_LENGTH         20000

#define ENCRYPTED_EXTENSIONS_MAX_LENGTH 20000

#define SERVER_KEY_EXCH_MAX_LENGTH      102400

#define SERVER_HELLO_DONE_MAX_LENGTH    0

#define CCS_MAX_LENGTH                  1