diff options
| author | Matt Caswell <matt@openssl.org> | 2017-06-27 14:57:15 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-06-29 10:15:49 +0100 |
| commit | 0ca8d1ecf26b4a564222fc17e0e48053f2fd0843 (patch) | |
| tree | 3982dfa368c1054db3123f548133068d28a2a481 /ssl/ssl_locl.h | |
| parent | 519a5d1ef2ca3ba0adf0bc1d7dff984e8523d813 (diff) | |
Update SSL_export_keying_material() for TLSv1.3
Fixes #3680
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3782)
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 7889ab5b0e..1105416d96 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1073,6 +1073,7 @@ struct ssl_st { unsigned char handshake_traffic_hash[EVP_MAX_MD_SIZE]; unsigned char client_app_traffic_secret[EVP_MAX_MD_SIZE]; unsigned char server_app_traffic_secret[EVP_MAX_MD_SIZE]; + unsigned char exporter_master_secret[EVP_MAX_MD_SIZE]; EVP_CIPHER_CTX *enc_read_ctx; /* cryptographic state */ unsigned char read_iv[EVP_MAX_IV_LENGTH]; /* TLSv1.3 static read IV */ EVP_MD_CTX *read_hash; /* used for mac generation */ @@ -2288,6 +2289,10 @@ __owur int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, const char *label, size_t llen, const unsigned char *p, size_t plen, int use_context); +__owur int tls13_export_keying_material(SSL *s, unsigned char *out, size_t olen, + const char *label, size_t llen, + const unsigned char *context, + size_t contextlen, int use_context); __owur int tls1_alert_code(int code); __owur int tls13_alert_code(int code); __owur int ssl3_alert_code(int code); |