Commit 26f42684 authored by Benjamin Kaduk's avatar Benjamin Kaduk Committed by Richard Levitte
Browse files

Store the number of extensions in CLIENTHELLO_MSG 



Keep track of the length of the pre_proc_exts array.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2279)
parent fc5ece2e

ssl/ssl_locl.h

+1 −0
Original line number Diff line number Diff line
@@ -1797,6 +1797,7 @@ typedef struct { 
    size_t compressions_len;

    unsigned char compressions[MAX_COMPRESSIONS_SIZE];

    PACKET extensions;

    size_t pre_proc_exts_len;

    RAW_EXTENSION *pre_proc_exts;

} CLIENTHELLO_MSG;

ssl/statem/statem_srvr.c

+2 −1
Original line number Diff line number Diff line
@@ -1423,7 +1423,8 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL *s, PACKET *pkt) 
    /* Preserve the raw extensions PACKET for later use */

    extensions = clienthello.extensions;

    if (!tls_collect_extensions(s, &extensions, EXT_CLIENT_HELLO,

                                &clienthello.pre_proc_exts, &al, NULL)) {

                                &clienthello.pre_proc_exts, &al,

                                &clienthello.pre_proc_exts_len)) {

        /* SSLerr already been called */

        goto f_err;

    }