diff options
| author | Matt Caswell <matt@openssl.org> | 2017-02-24 09:34:32 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-03-02 17:44:15 +0000 |
| commit | 329114f91f1a560bcf25ff2ebf5d608079e82272 (patch) | |
| tree | e184773ba009049a010fca38c0401f4c20ab898b /ssl/t1_enc.c | |
| parent | 2c604cb9af4a879ea43fd7fd84883a5e97ab0fe0 (diff) | |
Remove some TLSv1.3 TODOs that are no longer relevant
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2737)
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 4158548568..2969b88c80 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -483,13 +483,7 @@ 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) { - /* - * 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 hash). This will need to be removed later - */ - if ((s->session->flags & SSL_SESS_FLAG_EXTMS) - && !SSL_IS_TLS13(s)) { + if (s->session->flags & SSL_SESS_FLAG_EXTMS) { unsigned char hash[EVP_MAX_MD_SIZE * 2]; size_t hashlen; /* |