Commit f1429b85 authored by Benjamin Kaduk's avatar Benjamin Kaduk Committed by Matt Caswell
Browse files

Do not overallocate for tmp.ciphers_raw 



Well, not as much, at least.

Commit 07afdf3c changed things so
that for SSLv2 format ClientHellos we store the cipher list in the
TLS format, i.e., with two bytes per cipher, to be consistent with
historical behavior.

However, the space allocated for the array still performed the computation
with three bytes per cipher, a needless over-allocation (though a relatively
small one, all things considered).

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2281)
parent 52ad5b60

ssl/statem/statem_srvr.c

+2 −1
Original line number Diff line number Diff line
@@ -3470,7 +3470,8 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, 
         * slightly over allocate because we won't store those. But that isn't a

         * problem.

         */

        raw = s->s3->tmp.ciphers_raw = OPENSSL_malloc(numciphers * n);

        raw = OPENSSL_malloc(numciphers * TLS_CIPHER_LEN);

        s->s3->tmp.ciphers_raw = raw;

        if (raw == NULL) {

            *al = SSL_AD_INTERNAL_ERROR;

            goto err;