Move ALPN processing into an extension finalisation function

[openssl.git] / ssl / t1_enc.c

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index df2ce3703057e9879fe353c92b6112e5894aee67..d97b9a8ea904d096a28200f01c33d70d9fb6d805 100644 (file)
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -477,10 +477,10 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
     /*
      * 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
+     * handshake hash). This will need to be removed later
      */
     if ((s->session->flags & SSL_SESS_FLAG_EXTMS)
-            && s->version != TLS1_3_VERSION) {
+            && !SSL_IS_TLS13(s)) {
         unsigned char hash[EVP_MAX_MD_SIZE * 2];
         size_t hashlen;
         /*