The branch master has been updated via 2de5a5fbdd14f514e962cccfe90482c37786c183 (commit) from 5f95fbf39987848fc50fc8acf42eb8f4a7ec8666 (commit)
- Log ----------------------------------------------------------------- commit 2de5a5fbdd14f514e962cccfe90482c37786c183 Author: dcruette <dcrue...@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 <m...@openssl.org> Reviewed-by: Kurt Roeckx <k...@roeckx.be> Reviewed-by: Matthias St. Pierre <matthias.st.pie...@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/10700) ----------------------------------------------------------------------- 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 266b7dfd21..9c44813ccb 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -49,7 +49,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;