From: dcruette <dcruette@qualitesys.com>
Date: Tue, 24 Dec 2019 21:48:19 +0000 (+0100)
Subject: Update tls13_enc.c
X-Git-Tag: OpenSSL_1_1_1e~83
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=10e166abd47790155766b774910ededa3add74dc;p=oweals%2Fopenssl.git

Update tls13_enc.c

Fix double + in hkdflabel declaration (FIXES #10675)
CLA: trivial

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10700)

(cherry picked from commit 2de5a5fbdd14f514e962cccfe90482c37786c183)
---

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;