diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2017-07-16 12:40:48 +0900 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-07-17 13:42:52 +0100 |
| commit | c8b93876f116e761e6427594c183ee4e82c6bda5 (patch) | |
| tree | 1f5f7b8c46ff98c8a3c1f0616cf24c943d6dd9ea /ssl/tls13_enc.c | |
| parent | 54e5ba058b4f2c6042c14d44868077e9ffcff818 (diff) | |
Fix TLSv1.3 exporter secret
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3941)
Diffstat (limited to 'ssl/tls13_enc.c')
| -rw-r--r-- | ssl/tls13_enc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index 44d8ba9eb1..ac5d06cf58 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -607,10 +607,10 @@ int tls13_export_keying_material(SSL *s, unsigned char *out, size_t olen, { unsigned char exportsecret[EVP_MAX_MD_SIZE]; static const unsigned char exporterlabel[] = "exporter"; - unsigned char hash[EVP_MAX_MD_SIZE]; + unsigned char hash[EVP_MAX_MD_SIZE], data[EVP_MAX_MD_SIZE]; const EVP_MD *md = ssl_handshake_md(s); EVP_MD_CTX *ctx = EVP_MD_CTX_new(); - unsigned int hashsize; + unsigned int hashsize, datalen; int ret = 0; if (ctx == NULL || !SSL_is_init_finished(s)) @@ -622,9 +622,11 @@ int tls13_export_keying_material(SSL *s, unsigned char *out, size_t olen, if (EVP_DigestInit_ex(ctx, md, NULL) <= 0 || EVP_DigestUpdate(ctx, context, contextlen) <= 0 || EVP_DigestFinal_ex(ctx, hash, &hashsize) <= 0 + || EVP_DigestInit_ex(ctx, md, NULL) <= 0 + || EVP_DigestFinal_ex(ctx, data, &datalen) <= 0 || !tls13_hkdf_expand(s, md, s->exporter_master_secret, - (const unsigned char *)label, llen, NULL, 0, - exportsecret, hashsize) + (const unsigned char *)label, llen, + data, datalen, exportsecret, hashsize) || !tls13_hkdf_expand(s, md, exportsecret, exporterlabel, sizeof(exporterlabel) - 1, hash, hashsize, out, olen)) |