commit 2cc6f449d7e238f4a651e976481b56c1939839d9
author Alessandro Ghedini <alessandro@cloudflare.com> Tue Dec 11 11:35:17 2018 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Dec 19 20:25:34 2018 +0000
tree 72302e54d0235cba6c15355a3b61a8c279c52080
parent ba9ad6628ca8f399cc1ef22824a6791181828639

Use same HKDF label as TLS 1.3 for QUIC as per draft-ietf-quic-tls-17

Change-Id: Ie9825634f0f290aa3af0e88477013f62e2e0c246
Reviewed-on: https://boringssl-review.googlesource.com/c/33724
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>

ssl/tls13_client.cc

diff --git a/ssl/tls13_client.cc b/ssl/tls13_client.cc
index 40913dc..0ab4021 100644
--- a/ssl/tls13_client.cc
+++ b/ssl/tls13_client.cc
@@ -883,8 +883,7 @@
     session->timeout = server_timeout;
   }
 
-  if (!tls13_derive_session_psk(session.get(), ticket_nonce,
-                                ssl->ctx->quic_method != nullptr)) {
+  if (!tls13_derive_session_psk(session.get(), ticket_nonce)) {
     return false;
   }