Bug 1572791 - Fixup clang-format r=bustage
authorJ.C. Jones <jjones@mozilla.com>
Tue, 13 Aug 2019 10:54:58 -0700
changeset 15250 ec113de50cdd1d4ccb160870099165a0f4d2b99e
parent 15249 ed50678575639fdf32c7d461b343aaf5f5b4ea77
child 15251 9bc47e69613e9ee9c8aaaf555150f815fc8161d9
push id3461
push userjjones@mozilla.com
push dateTue, 13 Aug 2019 17:55:33 +0000
reviewersbustage
bugs1572791
Bug 1572791 - Fixup clang-format r=bustage
gtests/ssl_gtest/ssl_resumption_unittest.cc
gtests/ssl_gtest/tls_agent.cc
--- a/gtests/ssl_gtest/ssl_resumption_unittest.cc
+++ b/gtests/ssl_gtest/ssl_resumption_unittest.cc
@@ -1296,17 +1296,17 @@ TEST_P(TlsConnectTls13ResumptionToken, C
   ASSERT_TRUE(client_->MaybeSetResumptionToken());
 
   // Get resumption token infos
   SSLResumptionTokenInfo tokenInfo = {0};
   ScopedSSLResumptionTokenInfo token(&tokenInfo);
   client_->GetTokenInfo(token);
   ScopedCERTCertificate cert(
       PK11_FindCertFromNickname(server_->name().c_str(), nullptr));
-  ASSERT_NE(nullptr, cert.get());  
+  ASSERT_NE(nullptr, cert.get());
   CheckGetInfoResult(now(), 1, 1024, cert, token);
 
   ZeroRttSendReceive(true, true);
   Handshake();
   ExpectEarlyDataAccepted(true);
   CheckConnected();
   CheckAlpn("a");
 
--- a/gtests/ssl_gtest/tls_agent.cc
+++ b/gtests/ssl_gtest/tls_agent.cc
@@ -124,23 +124,23 @@ void TlsAgent::SetState(State s) {
   state_ = s;
 }
 
 /*static*/ bool TlsAgent::LoadCertificate(const std::string& name,
                                           ScopedCERTCertificate* cert,
                                           ScopedSECKEYPrivateKey* priv) {
   cert->reset(PK11_FindCertFromNickname(name.c_str(), nullptr));
   EXPECT_NE(nullptr, cert);
-  if(!cert) return false;
+  if (!cert) return false;
   EXPECT_NE(nullptr, cert->get());
   if (!cert->get()) return false;
 
   priv->reset(PK11_FindKeyByAnyCert(cert->get(), nullptr));
   EXPECT_NE(nullptr, priv);
-  if(!priv) return false;
+  if (!priv) return false;
   EXPECT_NE(nullptr, priv->get());
   if (!priv->get()) return false;
 
   return true;
 }
 
 // Loads a key pair from the certificate identified by |id|.
 /*static*/ bool TlsAgent::LoadKeyPairFromCert(const std::string& name,
@@ -162,17 +162,18 @@ void TlsAgent::SetState(State s) {
 void TlsAgent::DelegateCredential(const std::string& name,
                                   const ScopedSECKEYPublicKey& dc_pub,
                                   SSLSignatureScheme dc_cert_verify_alg,
                                   PRUint32 dc_valid_for, PRTime now,
                                   SECItem* dc) {
   ScopedCERTCertificate cert;
   ScopedSECKEYPrivateKey cert_priv;
   EXPECT_TRUE(TlsAgent::LoadCertificate(name, &cert, &cert_priv))
-    << "Could not load delegate certificate: " << name << "; test db corrupt?";
+      << "Could not load delegate certificate: " << name
+      << "; test db corrupt?";
 
   EXPECT_EQ(SECSuccess,
             SSL_DelegateCredential(cert.get(), cert_priv.get(), dc_pub.get(),
                                    dc_cert_verify_alg, dc_valid_for, now, dc));
 }
 
 void TlsAgent::EnableDelegatedCredentials() {
   ASSERT_TRUE(EnsureTlsSetup());