Bug 1333937 - False start causes SSL_Forcehandshake to report success…

… early, a=bustage
sailfishos-mirror · Jan 30, 2017 · bca5946 · bca5946
1 parent 741fd40
commit bca5946
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/gtests/ssl_gtest/tls_agent.cc b/gtests/ssl_gtest/tls_agent.cc
@@ -735,8 +735,10 @@ void TlsAgent::Handshake() {
   LOGV("Handshake");
   SECStatus rv = SSL_ForceHandshake(ssl_fd_);
   if (rv == SECSuccess) {
-    EXPECT_EQ(STATE_CONNECTED, state_)
-        << "the handshake callback should have been called already";
+    if (!falsestart_enabled_) {
+      EXPECT_EQ(STATE_CONNECTED, state_)
+          << "the handshake callback should have been called already";
+    }
 
     Poller::Instance()->Wait(READABLE_EVENT, adapter_, this,
                              &TlsAgent::ReadableCallback);