[openssl] OpenSSL_1_1_1-stable update

matthias.st.pierre at ncp-e.com matthias.st.pierre at ncp-e.com
Thu Jan 2 12:52:29 UTC 2020


The branch OpenSSL_1_1_1-stable has been updated
       via  10e166abd47790155766b774910ededa3add74dc (commit)
      from  3c57b9c5810d92f75da2c1dda325439c7ebd3c97 (commit)


- Log -----------------------------------------------------------------
commit 10e166abd47790155766b774910ededa3add74dc
Author: dcruette <dcruette at qualitesys.com>
Date:   Tue Dec 24 22:48:19 2019 +0100

    Update tls13_enc.c
    
    Fix double + in hkdflabel declaration (FIXES #10675)
    CLA: trivial
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10700)
    
    (cherry picked from commit 2de5a5fbdd14f514e962cccfe90482c37786c183)

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

Summary of changes:
 ssl/tls13_enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
index 36de1943ef..c07e3005b6 100644
--- a/ssl/tls13_enc.c
+++ b/ssl/tls13_enc.c
@@ -44,7 +44,7 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
      * prefix and label + bytes for the label itself + 1 byte length of hash
      * + bytes for the hash itself
      */
-    unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t) +
+    unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t)
                             + (sizeof(label_prefix) - 1) + TLS13_MAX_LABEL_LEN
                             + 1 + EVP_MAX_MD_SIZE];
     WPACKET pkt;


More information about the openssl-commits mailing list