zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename private member functions to use CamelCase.

Browse Source 
Just a simple rename change to update these functions to be in compliance with
the WebRTC/Chromium style guide.

Bug: webrtc:9860
Change-Id: I5bc831754c80b7b00bd1e5e0b3905e55f5d22b0c
Reviewed-on: https://webrtc-review.googlesource.com/c/108204
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25402}
This commit is contained in:
Benjamin Wright
2018-10-26 17:57:00 -07:00
committed by Commit Bot
parent 61c5cc8eb5
commit 5d35554973
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtc_base/opensslstreamadapter.cc
View File

@ -302,7 +302,7 @@ bool OpenSSLStreamAdapter::SetPeerCertificateDigest(
size_t digest_len,
SSLPeerCertificateDigestError* error) {
RTC_DCHECK(!peer_certificate_verified_);
RTC_DCHECK(!has_peer_certificate_digest());
RTC_DCHECK(!HasPeerCertificateDigest());
size_t expected_len;
if (error) {
*error = SSLPeerCertificateDigestError::NONE;
@ -534,7 +534,7 @@ StreamResult OpenSSLStreamAdapter::Write(const void* data,
return SR_BLOCK;
case SSL_CONNECTED:
if (waiting_to_verify_peer_certificate()) {
if (WaitingToVerifyPeerCertificate()) {
return SR_BLOCK;
}
break;
@ -600,7 +600,7 @@ StreamResult OpenSSLStreamAdapter::Read(void* data,
case SSL_CONNECTING:
return SR_BLOCK;
case SSL_CONNECTED:
if (waiting_to_verify_peer_certificate()) {
if (WaitingToVerifyPeerCertificate()) {
return SR_BLOCK;
}
break;
@ -708,7 +708,7 @@ StreamState OpenSSLStreamAdapter::GetState() const {
case SSL_CONNECTING:
return SS_OPENING;
case SSL_CONNECTED:
if (waiting_to_verify_peer_certificate()) {
if (WaitingToVerifyPeerCertificate()) {
return SS_OPENING;
}
return SS_OPEN;
@ -855,7 +855,7 @@ int OpenSSLStreamAdapter::ContinueSSL() {
RTC_DCHECK(peer_cert_chain_ || !GetClientAuthEnabled());
state_ = SSL_CONNECTED;
if (!waiting_to_verify_peer_certificate()) {
if (!WaitingToVerifyPeerCertificate()) {
// We have everything we need to start the connection, so signal
// SE_OPEN. If we need a client certificate fingerprint and don't have
// it yet, we'll instead signal SE_OPEN in SetPeerCertificateDigest.
@ -1082,7 +1082,7 @@ SSL_CTX* OpenSSLStreamAdapter::SetupSSLContext() {
}
bool OpenSSLStreamAdapter::VerifyPeerCertificate() {
if (!has_peer_certificate_digest() || !peer_cert_chain_ ||
if (!HasPeerCertificateDigest() || !peer_cert_chain_ ||
!peer_cert_chain_->GetSize()) {
RTC_LOG(LS_WARNING) << "Missing digest or peer certificate.";
return false;

4
rtc_base/opensslstreamadapter.h
View File

@ -175,11 +175,11 @@ class OpenSSLStreamAdapter final : public SSLStreamAdapter {
// SSL_CTX_set_cert_verify_callback.
static int SSLVerifyCallback(X509_STORE_CTX* store, void* arg);
bool waiting_to_verify_peer_certificate() const {
bool WaitingToVerifyPeerCertificate() const {
return GetClientAuthEnabled() && !peer_certificate_verified_;
}
bool has_peer_certificate_digest() const {
bool HasPeerCertificateDigest() const {
return !peer_certificate_digest_algorithm_.empty() &&
!peer_certificate_digest_value_.empty();
}