Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1572791 - Fixup clang-format r=bustage
  • Loading branch information
jcjones committed Aug 13, 2019
1 parent afc2beb commit b9ce9a0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gtests/ssl_gtest/ssl_resumption_unittest.cc
Expand Up @@ -1301,7 +1301,7 @@ TEST_P(TlsConnectTls13ResumptionToken, ConnectResumeGetInfoZeroRtt) {
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);
Expand Down
7 changes: 4 additions & 3 deletions gtests/ssl_gtest/tls_agent.cc
Expand Up @@ -129,13 +129,13 @@ void TlsAgent::SetState(State s) {
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;

Expand Down Expand Up @@ -167,7 +167,8 @@ void TlsAgent::DelegateCredential(const std::string& name,
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(),
Expand Down

0 comments on commit b9ce9a0

Please sign in to comment.