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

Following the previous 2 commits also move ecpointformats out of session 



The previous 2 commits moved supported groups and ciphers out of the
session object to avoid race conditions. We now also move ecpointformats
for consistency. There does not seem to be a race condition with access
to this data since it is only ever set in a non-resumption handshake.
However, there is no reason for it to be in the session.

Reviewed-by: default avatarTomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9176)
parent 860fed97

ssl/s3_lib.c

+3 −4
Original line number Diff line number Diff line
@@ -3716,13 +3716,12 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) 
#ifndef OPENSSL_NO_EC

    case SSL_CTRL_GET_EC_POINT_FORMATS:

        {

            SSL_SESSION *sess = s->session;

            const unsigned char **pformat = parg;



            if (sess == NULL || sess->ext.ecpointformats == NULL)

            if (s->ext.peer_ecpointformats == NULL)

                return 0;

            *pformat = sess->ext.ecpointformats;

            return (int)sess->ext.ecpointformats_len;

            *pformat = s->ext.peer_ecpointformats;

            return (int)s->ext.peer_ecpointformats_len;

        }

#endif

ssl/ssl_lib.c

+1 −0
Original line number Diff line number Diff line
@@ -1179,6 +1179,7 @@ void SSL_free(SSL *s) 
    SSL_CTX_free(s->session_ctx);

#ifndef OPENSSL_NO_EC

    OPENSSL_free(s->ext.ecpointformats);

    OPENSSL_free(s->ext.peer_ecpointformats);

    OPENSSL_free(s->ext.supportedgroups);

    OPENSSL_free(s->ext.peer_supportedgroups);

#endif                          /* OPENSSL_NO_EC */

ssl/ssl_locl.h

+4 −4
Original line number Diff line number Diff line
@@ -561,10 +561,6 @@ struct ssl_session_st { 


    struct {

        char *hostname;

# ifndef OPENSSL_NO_EC

        size_t ecpointformats_len;

        unsigned char *ecpointformats; /* peer's list */

# endif                         /* OPENSSL_NO_EC */

        /* RFC4507 info */

        unsigned char *tick; /* Session ticket */

        size_t ticklen;      /* Session ticket length */
@@ -1298,6 +1294,10 @@ struct ssl_st { 
        size_t ecpointformats_len;

        /* our list */

        unsigned char *ecpointformats;



        size_t peer_ecpointformats_len;

        /* peer's list */

        unsigned char *peer_ecpointformats;

# endif                         /* OPENSSL_NO_EC */

        size_t supportedgroups_len;

        /* our list */

ssl/ssl_sess.c

+0 −17
Original line number Diff line number Diff line
@@ -122,9 +122,6 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) 
    dest->psk_identity = NULL;

#endif

    dest->ext.hostname = NULL;

#ifndef OPENSSL_NO_EC

    dest->ext.ecpointformats = NULL;

#endif

    dest->ext.tick = NULL;

    dest->ext.alpn_selected = NULL;

#ifndef OPENSSL_NO_SRP
@@ -185,15 +182,6 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) 
            goto err;

        }

    }

#ifndef OPENSSL_NO_EC

    if (src->ext.ecpointformats) {

        dest->ext.ecpointformats =

            OPENSSL_memdup(src->ext.ecpointformats,

                           src->ext.ecpointformats_len);

        if (dest->ext.ecpointformats == NULL)

            goto err;

    }

#endif



    if (ticket != 0 && src->ext.tick != NULL) {

        dest->ext.tick =
@@ -776,11 +764,6 @@ void SSL_SESSION_free(SSL_SESSION *ss) 
    sk_X509_pop_free(ss->peer_chain, X509_free);

    OPENSSL_free(ss->ext.hostname);

    OPENSSL_free(ss->ext.tick);

#ifndef OPENSSL_NO_EC

    OPENSSL_free(ss->ext.ecpointformats);

    ss->ext.ecpointformats = NULL;

    ss->ext.ecpointformats_len = 0;

#endif                          /* OPENSSL_NO_EC */

#ifndef OPENSSL_NO_PSK

    OPENSSL_free(ss->psk_identity_hint);

    OPENSSL_free(ss->psk_identity);

ssl/statem/extensions.c

+5 −5
Original line number Diff line number Diff line
@@ -1040,18 +1040,18 @@ static int final_ec_pt_formats(SSL *s, unsigned int context, int sent) 
     */

    if (s->ext.ecpointformats != NULL

            && s->ext.ecpointformats_len > 0

            && s->session->ext.ecpointformats != NULL

            && s->session->ext.ecpointformats_len > 0

            && s->ext.peer_ecpointformats != NULL

            && s->ext.peer_ecpointformats_len > 0

            && ((alg_k & SSL_kECDHE) || (alg_a & SSL_aECDSA))) {

        /* we are using an ECC cipher */

        size_t i;

        unsigned char *list = s->session->ext.ecpointformats;

        unsigned char *list = s->ext.peer_ecpointformats;



        for (i = 0; i < s->session->ext.ecpointformats_len; i++) {

        for (i = 0; i < s->ext.peer_ecpointformats_len; i++) {

            if (*list++ == TLSEXT_ECPOINTFORMAT_uncompressed)

                break;

        }

        if (i == s->session->ext.ecpointformats_len) {

        if (i == s->ext.peer_ecpointformats_len) {

            SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_FINAL_EC_PT_FORMATS,

                     SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST);

            return 0;