diff options
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 8d1e350a61..df2ce37030 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -474,7 +474,13 @@ size_t tls1_final_finish_mac(SSL *s, const char *str, size_t slen, int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, size_t len, size_t *secret_size) { - if (s->session->flags & SSL_SESS_FLAG_EXTMS) { + /* + * TODO(TLS1.3): We haven't implemented TLS1.3 key derivation yet. For now + * we will just force no use of EMS (which adds complications around the + * handshake has). This will need to be removed later + */ + if ((s->session->flags & SSL_SESS_FLAG_EXTMS) + && s->version != TLS1_3_VERSION) { unsigned char hash[EVP_MAX_MD_SIZE * 2]; size_t hashlen; /* |