[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  0b4233f5a4a181a6dcb7c511cd2663e500e659a4 (commit)
      from  005247af76aa8d623fadbf3a82aa7b8ef449989f (commit)


- Log -----------------------------------------------------------------
commit 0b4233f5a4a181a6dcb7c511cd2663e500e659a4
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Dec 16 12:43:59 2018 +0100

    Fix a minor nit in the hkdflabel size
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7913)

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

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 17966c8..6022950 100644
--- a/ssl/tls13_enc.c
+++ b/ssl/tls13_enc.c
@@ -41,7 +41,7 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
      * + bytes for the hash itself
      */
     unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t) +
-                            + sizeof(label_prefix) + TLS13_MAX_LABEL_LEN
+                            + (sizeof(label_prefix) - 1) + TLS13_MAX_LABEL_LEN
                             + 1 + EVP_MAX_MD_SIZE];
     WPACKET pkt;