wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TLS1.3: Correct intermediate secret derivation

Browse source 
This label for this derivation was incorrectly "derived" or "der" depending
on the pointer size of the build(!). The correct string is "derived secret".

(cherry picked from commit 936dcf272033c1bf59a5e859ec63e2557194f191)

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2989)
This commit is contained in:
Joseph Birr-Pixton 2017-03-19 16:40:14 +00:00 committed by Matt Caswell
parent 43c564170c
commit b0c9fc9b48
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ssl/tls13_enc.c
View file

@ -124,7 +124,7 @@ int tls13_generate_secret(SSL *s, const EVP_MD *md,
size_t mdlen, prevsecretlen;
int ret;
EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
const char *derived_secret_label = "derived secret";
static const char derived_secret_label[] = "derived secret";
unsigned char preextractsec[EVP_MAX_MD_SIZE];
if (pctx == NULL)