From f54e30b596b96576723027c386c20cfc560e0114 Mon Sep 17 00:00:00 2001 From: Benjamin Wright Date: Tue, 26 Feb 2019 17:33:50 -0800 Subject: [PATCH] Add const to variables in openssl_stream_adapter.cc that can use it. This change simply adds const to all the variables that can use it. It seemed like a good idea to enforce const correctness where possible in the TLS stack. Bug: webrtc:9860 Change-Id: Iabfe1e26647b0c21e2f209e0e0f96d0ec7465e7a Reviewed-on: https://webrtc-review.googlesource.com/c/124623 Commit-Queue: Karl Wiberg Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#26865} --- rtc_base/openssl_stream_adapter.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rtc_base/openssl_stream_adapter.cc b/rtc_base/openssl_stream_adapter.cc index 5ad4e03156..7ff8a1a9ee 100644 --- a/rtc_base/openssl_stream_adapter.cc +++ b/rtc_base/openssl_stream_adapter.cc @@ -624,8 +624,9 @@ StreamResult OpenSSLStreamAdapter::Read(void* data, ssl_read_needs_write_ = false; - int code = SSL_read(ssl_, data, checked_cast(data_len)); - int ssl_error = SSL_get_error(ssl_, code); + const int code = SSL_read(ssl_, data, checked_cast(data_len)); + const int ssl_error = SSL_get_error(ssl_, code); + switch (ssl_error) { case SSL_ERROR_NONE: RTC_LOG(LS_VERBOSE) << " -- success"; @@ -676,10 +677,10 @@ void OpenSSLStreamAdapter::FlushInput(unsigned int left) { while (left) { // This should always succeed - int toread = (sizeof(buf) < left) ? sizeof(buf) : left; - int code = SSL_read(ssl_, buf, toread); + const int toread = (sizeof(buf) < left) ? sizeof(buf) : left; + const int code = SSL_read(ssl_, buf, toread); - int ssl_error = SSL_get_error(ssl_, code); + const int ssl_error = SSL_get_error(ssl_, code); RTC_DCHECK(ssl_error == SSL_ERROR_NONE); if (ssl_error != SSL_ERROR_NONE) { @@ -831,9 +832,10 @@ int OpenSSLStreamAdapter::ContinueSSL() { // Clear the DTLS timer Thread::Current()->Clear(this, MSG_TIMEOUT); - int code = (role_ == SSL_CLIENT) ? SSL_connect(ssl_) : SSL_accept(ssl_); - int ssl_error; - switch (ssl_error = SSL_get_error(ssl_, code)) { + const int code = (role_ == SSL_CLIENT) ? SSL_connect(ssl_) : SSL_accept(ssl_); + const int ssl_error = SSL_get_error(ssl_, code); + + switch (ssl_error) { case SSL_ERROR_NONE: RTC_LOG(LS_VERBOSE) << " -- success"; // By this point, OpenSSL should have given us a certificate, or errored