Refactor: Renaming ssl_cert_chain to GetSSLCertificateChain()
Underscore methods in the middle of classes is against the chromium style guide
this change is part of a long series of changes to refactor crypto code in
WebRTC to conform to the chromium standard better.
1. ssl_cert() -> GetSSLCertificate()
2. ssl_cert_chain() -> GetSSLCertificateChain()
3. Small tidying up in rtccertificategenerator.cc
Bug: webrtc:9860
Change-Id: I670f76e31d6d4f873034edb72d958b3c227379cb
Reviewed-on: https://webrtc-review.googlesource.com/c/107802
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25371}diff --git a/pc/jseptransport_unittest.cc b/pc/jseptransport_unittest.cc
index 748a4e0..b8265de 100644
--- a/pc/jseptransport_unittest.cc
+++ b/pc/jseptransport_unittest.cc
@@ -383,7 +383,7 @@
ASSERT_NE(nullptr, certificate);
std::string digest_algorithm;
- ASSERT_TRUE(certificate->ssl_certificate().GetSignatureDigestAlgorithm(
+ ASSERT_TRUE(certificate->GetSSLCertificate().GetSignatureDigestAlgorithm(
&digest_algorithm));
ASSERT_FALSE(digest_algorithm.empty());
std::unique_ptr<rtc::SSLFingerprint> good_fingerprint =
diff --git a/pc/peerconnection_integrationtest.cc b/pc/peerconnection_integrationtest.cc
index b645ab1..236a8bb 100644
--- a/pc/peerconnection_integrationtest.cc
+++ b/pc/peerconnection_integrationtest.cc
@@ -1821,26 +1821,26 @@
auto caller_remote_cert = GetRemoteAudioSSLCertificate(caller());
ASSERT_TRUE(caller_remote_cert);
- EXPECT_EQ(callee_cert->ssl_certificate().ToPEMString(),
+ EXPECT_EQ(callee_cert->GetSSLCertificate().ToPEMString(),
caller_remote_cert->ToPEMString());
auto callee_remote_cert = GetRemoteAudioSSLCertificate(callee());
ASSERT_TRUE(callee_remote_cert);
- EXPECT_EQ(caller_cert->ssl_certificate().ToPEMString(),
+ EXPECT_EQ(caller_cert->GetSSLCertificate().ToPEMString(),
callee_remote_cert->ToPEMString());
auto caller_remote_cert_chain = GetRemoteAudioSSLCertChain(caller());
ASSERT_TRUE(caller_remote_cert_chain);
ASSERT_EQ(1U, caller_remote_cert_chain->GetSize());
auto remote_cert = &caller_remote_cert_chain->Get(0);
- EXPECT_EQ(callee_cert->ssl_certificate().ToPEMString(),
+ EXPECT_EQ(callee_cert->GetSSLCertificate().ToPEMString(),
remote_cert->ToPEMString());
auto callee_remote_cert_chain = GetRemoteAudioSSLCertChain(callee());
ASSERT_TRUE(callee_remote_cert_chain);
ASSERT_EQ(1U, callee_remote_cert_chain->GetSize());
remote_cert = &callee_remote_cert_chain->Get(0);
- EXPECT_EQ(caller_cert->ssl_certificate().ToPEMString(),
+ EXPECT_EQ(caller_cert->GetSSLCertificate().ToPEMString(),
remote_cert->ToPEMString());
}
diff --git a/pc/rtcstatscollector.cc b/pc/rtcstatscollector.cc
index d883943..32e0b65 100644
--- a/pc/rtcstatscollector.cc
+++ b/pc/rtcstatscollector.cc
@@ -1388,7 +1388,7 @@
rtc::scoped_refptr<rtc::RTCCertificate> local_certificate;
if (pc_->GetLocalCertificate(transport_name, &local_certificate)) {
certificate_stats_pair.local =
- local_certificate->ssl_cert_chain().GetStats();
+ local_certificate->GetSSLCertificateChain().GetStats();
}
std::unique_ptr<rtc::SSLCertChain> remote_cert_chain =
diff --git a/pc/rtcstatscollector_unittest.cc b/pc/rtcstatscollector_unittest.cc
index 1a03e98..3fc0127 100644
--- a/pc/rtcstatscollector_unittest.cc
+++ b/pc/rtcstatscollector_unittest.cc
@@ -143,7 +143,7 @@
}
// Fingerprints for the whole certificate chain, starting with leaf
// certificate.
- const rtc::SSLCertChain& chain = info->certificate->ssl_cert_chain();
+ const rtc::SSLCertChain& chain = info->certificate->GetSSLCertificateChain();
std::unique_ptr<rtc::SSLFingerprint> fp;
for (size_t i = 0; i < chain.GetSize(); i++) {
fp = rtc::SSLFingerprint::Create("sha-1", chain.Get(i));
@@ -703,7 +703,8 @@
CreateFakeCertificateAndInfoFromDers(
std::vector<std::string>({"(remote) single certificate"}));
pc_->SetRemoteCertChain(
- kTransportName, remote_certinfo->certificate->ssl_cert_chain().Clone());
+ kTransportName,
+ remote_certinfo->certificate->GetSSLCertificateChain().Clone());
rtc::scoped_refptr<const RTCStatsReport> report = stats_->GetStatsReport();
@@ -817,7 +818,7 @@
std::vector<std::string>({"(remote) audio"}));
pc_->SetRemoteCertChain(
kAudioTransport,
- audio_remote_certinfo->certificate->ssl_cert_chain().Clone());
+ audio_remote_certinfo->certificate->GetSSLCertificateChain().Clone());
pc_->AddVideoChannel("video", kVideoTransport);
std::unique_ptr<CertificateInfo> video_local_certinfo =
@@ -829,7 +830,7 @@
std::vector<std::string>({"(remote) video"}));
pc_->SetRemoteCertChain(
kVideoTransport,
- video_remote_certinfo->certificate->ssl_cert_chain().Clone());
+ video_remote_certinfo->certificate->GetSSLCertificateChain().Clone());
rtc::scoped_refptr<const RTCStatsReport> report = stats_->GetStatsReport();
ExpectReportContainsCertificateInfo(report, *audio_local_certinfo);
@@ -853,7 +854,8 @@
"(remote) another",
"(remote) chain"});
pc_->SetRemoteCertChain(
- kTransportName, remote_certinfo->certificate->ssl_cert_chain().Clone());
+ kTransportName,
+ remote_certinfo->certificate->GetSSLCertificateChain().Clone());
rtc::scoped_refptr<const RTCStatsReport> report = stats_->GetStatsReport();
ExpectReportContainsCertificateInfo(report, *local_certinfo);
@@ -1954,7 +1956,8 @@
CreateFakeCertificateAndInfoFromDers(
{"(remote) local", "(remote) chain"});
pc_->SetRemoteCertChain(
- kTransportName, remote_certinfo->certificate->ssl_cert_chain().Clone());
+ kTransportName,
+ remote_certinfo->certificate->GetSSLCertificateChain().Clone());
report = stats_->GetFreshStatsReport();
diff --git a/pc/statscollector.cc b/pc/statscollector.cc
index 23a4493..a1d52db 100644
--- a/pc/statscollector.cc
+++ b/pc/statscollector.cc
@@ -783,8 +783,8 @@
StatsReport::Id local_cert_report_id, remote_cert_report_id;
rtc::scoped_refptr<rtc::RTCCertificate> certificate;
if (pc_->GetLocalCertificate(transport_name, &certificate)) {
- StatsReport* r =
- AddCertificateReports(certificate->ssl_cert_chain().GetStats());
+ StatsReport* r = AddCertificateReports(
+ certificate->GetSSLCertificateChain().GetStats());
if (r)
local_cert_report_id = r->id();
}