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_server.cc

diff --git a/ssl/tls13_server.cc b/ssl/tls13_server.cc
index 7073b57..efdb602 100644
--- a/ssl/tls13_server.cc
+++ b/ssl/tls13_server.cc
@@ -194,8 +194,7 @@
         !CBB_add_u8_length_prefixed(&body, &nonce_cbb) ||
         !CBB_add_bytes(&nonce_cbb, nonce, sizeof(nonce)) ||
         !CBB_add_u16_length_prefixed(&body, &ticket) ||
-        !tls13_derive_session_psk(session.get(), nonce,
-                                  ssl->ctx->quic_method != nullptr) ||
+        !tls13_derive_session_psk(session.get(), nonce) ||
         !ssl_encrypt_ticket(hs, &ticket, session.get()) ||
         !CBB_add_u16_length_prefixed(&body, &extensions)) {
       return false;