[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  f1429b85c5821e55224e5878da9d0fa420a41f71 (commit)
      from  52ad5b60e3a1fef12a1a5ea01527a90b8f92a34b (commit)


- Log -----------------------------------------------------------------
commit f1429b85c5821e55224e5878da9d0fa420a41f71
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Tue Jan 24 10:50:21 2017 -0600

    Do not overallocate for tmp.ciphers_raw
    
    Well, not as much, at least.
    
    Commit 07afdf3c3ac97af4f2b4eec22a97f7230f8227e0 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: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2281)

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem_srvr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 8d6fd1f..84f6dfb 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -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;