Skip to content

Commit

Permalink
make CTPolicyEnforcer::CheckCompliance a const method
Browse files Browse the repository at this point in the history
Bug: 848277
Change-Id: I18d1215ee805756482d1fd740f990cb64fe96268
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5091497
Reviewed-by: Carlos IL <carlosil@chromium.org>
Reviewed-by: Hayato Ito <hayato@chromium.org>
Commit-Queue: Matt Mueller <mattm@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1236519}
  • Loading branch information
matt-mueller authored and Chromium LUCI CQ committed Dec 12, 2023
1 parent dac09c7 commit f22622d
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ ChromeCTPolicyEnforcer::~ChromeCTPolicyEnforcer() {}
CTPolicyCompliance ChromeCTPolicyEnforcer::CheckCompliance(
net::X509Certificate* cert,
const net::ct::SCTList& verified_scts,
const net::NetLogWithSource& net_log) {
const net::NetLogWithSource& net_log) const {
// If the build is not timely, no certificate is considered compliant
// with CT policy. The reasoning is that, for example, a log might
// have been pulled and is no longer considered valid; thus, a client
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class COMPONENT_EXPORT(CERTIFICATE_TRANSPARENCY) ChromeCTPolicyEnforcer
net::ct::CTPolicyCompliance CheckCompliance(
net::X509Certificate* cert,
const net::ct::SCTList& verified_scts,
const net::NetLogWithSource& net_log) override;
const net::NetLogWithSource& net_log) const override;

// Updates the list of logs used for compliance checks. |disqualified_logs|
// is a map of log ID to disqualification date.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ class GMockCertVerifier : public net::CertVerifier {

class MockCTPolicyEnforcer : public net::CTPolicyEnforcer {
public:
MOCK_METHOD3(
MOCK_CONST_METHOD3(
CheckCompliance,
net::ct::CTPolicyCompliance(net::X509Certificate* cert,
const net::ct::SCTList& verified_scts,
Expand Down
2 changes: 1 addition & 1 deletion net/cert/ct_policy_enforcer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace net {
ct::CTPolicyCompliance DefaultCTPolicyEnforcer::CheckCompliance(
X509Certificate* cert,
const ct::SCTList& verified_scts,
const NetLogWithSource& net_log) {
const NetLogWithSource& net_log) const {
return ct::CTPolicyCompliance::CT_POLICY_BUILD_NOT_TIMELY;
}

Expand Down
4 changes: 2 additions & 2 deletions net/cert/ct_policy_enforcer.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class NET_EXPORT CTPolicyEnforcer {
virtual ct::CTPolicyCompliance CheckCompliance(
X509Certificate* cert,
const ct::SCTList& verified_scts,
const NetLogWithSource& net_log) = 0;
const NetLogWithSource& net_log) const = 0;
};

// A default implementation of Certificate Transparency policies that is
Expand All @@ -53,7 +53,7 @@ class NET_EXPORT DefaultCTPolicyEnforcer : public net::CTPolicyEnforcer {
ct::CTPolicyCompliance CheckCompliance(
X509Certificate* cert,
const ct::SCTList& verified_scts,
const NetLogWithSource& net_log) override;
const NetLogWithSource& net_log) const override;
};

} // namespace net
Expand Down
8 changes: 4 additions & 4 deletions net/quic/crypto/proof_verifier_chromium_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ class FailsTestCertVerifier : public CertVerifier {
// A mock CTPolicyEnforcer that returns a custom verification result.
class MockCTPolicyEnforcer : public CTPolicyEnforcer {
public:
MOCK_METHOD3(CheckCompliance,
ct::CTPolicyCompliance(X509Certificate* cert,
const ct::SCTList&,
const NetLogWithSource&));
MOCK_CONST_METHOD3(CheckCompliance,
ct::CTPolicyCompliance(X509Certificate* cert,
const ct::SCTList&,
const NetLogWithSource&));
};

class MockRequireCTDelegate : public TransportSecurityState::RequireCTDelegate {
Expand Down
8 changes: 4 additions & 4 deletions net/socket/ssl_client_socket_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,10 @@ class DeleteSocketCallback : public TestCompletionCallbackBase {
// A mock CTPolicyEnforcer that returns a custom verification result.
class MockCTPolicyEnforcer : public CTPolicyEnforcer {
public:
MOCK_METHOD3(CheckCompliance,
ct::CTPolicyCompliance(X509Certificate* cert,
const ct::SCTList&,
const NetLogWithSource&));
MOCK_CONST_METHOD3(CheckCompliance,
ct::CTPolicyCompliance(X509Certificate* cert,
const ct::SCTList&,
const NetLogWithSource&));
};

class MockRequireCTDelegate : public TransportSecurityState::RequireCTDelegate {
Expand Down
2 changes: 1 addition & 1 deletion net/socket/ssl_server_socket_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class MockCTPolicyEnforcer : public CTPolicyEnforcer {
ct::CTPolicyCompliance CheckCompliance(
X509Certificate* cert,
const ct::SCTList& verified_scts,
const NetLogWithSource& net_log) override {
const NetLogWithSource& net_log) const override {
return ct::CTPolicyCompliance::CT_POLICY_COMPLIES_VIA_SCTS;
}
};
Expand Down
2 changes: 1 addition & 1 deletion net/url_request/url_request_quic_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class MockCTPolicyEnforcerNonCompliant : public CTPolicyEnforcer {
ct::CTPolicyCompliance CheckCompliance(
X509Certificate* cert,
const ct::SCTList& verified_scts,
const NetLogWithSource& net_log) override {
const NetLogWithSource& net_log) const override {
return ct::CTPolicyCompliance::CT_POLICY_NOT_DIVERSE_SCTS;
}
};
Expand Down

0 comments on commit f22622d

Please sign in to comment.