commit 40cdb3b5dad0a1028e40fbc73fa62a3e6d31fed7
author Adam Langley <agl@google.com> Wed Mar 07 12:03:35 2018 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Mar 07 20:27:11 2018 +0000
tree 69084c2a016bff994ce4a7b246b66d37a6084160
parent ec55dc15d3a39e5f1a58bfd79148729f38f6acb4

Don't test |initial_handshake_complete| for dummy PQ padding status.

Checking |initial_handshake_complete| was a mistake—it's not true for
False Start connections at the time when Chrome wants to measure whether
PQ padding was used or not.

Change-Id: I51757e00f3e02129666ee1ce31c30d63f1bcbe74
Reviewed-on: https://boringssl-review.googlesource.com/26444
Commit-Queue: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

include/openssl/ssl.h

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 35506f7..147ea5f 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2954,7 +2954,7 @@
 
 // SSL_dummy_pq_padding_used returns one if the server echoed a dummy PQ padding
 // extension and zero otherwise. It may only be called on a client connection
-// once the handshake has completed, otherwise it'll return zero.
+// once the ServerHello has been processed, otherwise it'll return zero.
 OPENSSL_EXPORT int SSL_dummy_pq_padding_used(SSL *ssl);
 
 

ssl/ssl_lib.cc

diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
index 9f56d54..ef79831 100644
--- a/ssl/ssl_lib.cc
+++ b/ssl/ssl_lib.cc
@@ -2441,7 +2441,7 @@
 }
 
 int SSL_dummy_pq_padding_used(SSL *ssl) {
-  if (ssl->server || !ssl->s3->initial_handshake_complete) {
+  if (ssl->server) {
     return 0;
   }