Revert of Allow the DTLS fingerprint verification to occur after the handshake.

webrtc/base/opensslstreamadapter.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #if HAVE_OPENSSL_SSL_H
 
 #include "webrtc/base/opensslstreamadapter.h"
 
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include <openssl/tls1.h>
 #include <openssl/x509v3.h>
 #ifndef OPENSSL_IS_BORINGSSL
 #include <openssl/dtls1.h>
 #endif
 
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/base/stream.h"
 #include "webrtc/base/openssl.h"
 #include "webrtc/base/openssladapter.h"
 #include "webrtc/base/openssldigest.h"
 #include "webrtc/base/opensslidentity.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/timeutils.h"
@@ skipping 245 matching lines @@
       state_(SSL_NONE),
       role_(SSL_CLIENT),
       ssl_read_needs_write_(false),
       ssl_write_needs_read_(false),
       ssl_(NULL),
       ssl_ctx_(NULL),
       ssl_mode_(SSL_MODE_TLS),
       ssl_max_version_(SSL_PROTOCOL_TLS_12) {}
 
 OpenSSLStreamAdapter::~OpenSSLStreamAdapter() {
-  Cleanup(0);
+  Cleanup();
 }
 
 void OpenSSLStreamAdapter::SetIdentity(SSLIdentity* identity) {
-  RTC_DCHECK(!identity_);
+  ASSERT(!identity_);
   identity_.reset(static_cast<OpenSSLIdentity*>(identity));
 }
 
 void OpenSSLStreamAdapter::SetServerRole(SSLRole role) {
   role_ = role;
 }
 
 std::unique_ptr<SSLCertificate> OpenSSLStreamAdapter::GetPeerCertificate()
     const {
   return peer_certificate_ ? std::unique_ptr<SSLCertificate>(
                                  peer_certificate_->GetReference())
                            : nullptr;
 }
 
-SSLPeerCertificateDigestError OpenSSLStreamAdapter::SetPeerCertificateDigest(
-    const std::string& digest_alg,
-    const unsigned char* digest_val,
-    size_t digest_len) {
-  RTC_DCHECK(!peer_certificate_verified_);
-  RTC_DCHECK(!has_peer_certificate_digest());
+bool OpenSSLStreamAdapter::SetPeerCertificateDigest(const std::string
+                                                    &digest_alg,
+                                                    const unsigned char*
+                                                    digest_val,
+                                                    size_t digest_len) {
+  ASSERT(!peer_certificate_);
+  ASSERT(peer_certificate_digest_algorithm_.size() == 0);
   size_t expected_len;
 
   if (!OpenSSLDigest::GetDigestSize(digest_alg, &expected_len)) {
     LOG(LS_WARNING) << "Unknown digest algorithm: " << digest_alg;
-    return SSLPeerCertificateDigestError::UNKNOWN_ALGORITHM;
+    return false;
   }
-  if (expected_len != digest_len) {
-    return SSLPeerCertificateDigestError::INVALID_LENGTH;
-  }
+  if (expected_len != digest_len)
+    return false;
 
   peer_certificate_digest_value_.SetData(digest_val, digest_len);
   peer_certificate_digest_algorithm_ = digest_alg;
 
-  if (!peer_certificate_) {
-    // Normal case, where the digest is set before we obtain the certificate
-    // from the handshake.
-    return SSLPeerCertificateDigestError::NONE;
-  }
-
-  if (!VerifyPeerCertificate()) {
-    Error("SetPeerCertificateDigest", -1, SSL_AD_BAD_CERTIFICATE, false);
-    return SSLPeerCertificateDigestError::VERIFICATION_FAILED;
-  }
-
-  if (state_ == SSL_CONNECTED) {
-    // Post the event asynchronously to unwind the stack. The caller
-    // of ContinueSSL may be the same object listening for these
-    // events and may not be prepared for reentrancy.
-    PostEvent(SE_OPEN | SE_READ | SE_WRITE, 0);
-  }
-
-  return SSLPeerCertificateDigestError::NONE;
+  return true;
 }
 
 std::string OpenSSLStreamAdapter::SslCipherSuiteToName(int cipher_suite) {
 #ifdef OPENSSL_IS_BORINGSSL
   const SSL_CIPHER* ssl_cipher = SSL_get_cipher_by_value(cipher_suite);
   if (!ssl_cipher) {
     return std::string();
   }
   char* cipher_name = SSL_CIPHER_get_rfc_name(ssl_cipher);
   std::string rfc_name = std::string(cipher_name);
@@ skipping 101 matching lines @@
 
   srtp_ciphers_ = internal_ciphers;
   return true;
 #else
   return false;
 #endif
 }
 
 bool OpenSSLStreamAdapter::GetDtlsSrtpCryptoSuite(int* crypto_suite) {
 #ifdef HAVE_DTLS_SRTP
-  RTC_DCHECK(state_ == SSL_CONNECTED);
+  ASSERT(state_ == SSL_CONNECTED);
   if (state_ != SSL_CONNECTED)
     return false;
 
   const SRTP_PROTECTION_PROFILE *srtp_profile =
       SSL_get_selected_srtp_profile(ssl_);
 
   if (!srtp_profile)
     return false;
 
   *crypto_suite = srtp_profile->id;
-  RTC_DCHECK(!SrtpCryptoSuiteToName(*crypto_suite).empty());
+  ASSERT(!SrtpCryptoSuiteToName(*crypto_suite).empty());
   return true;
 #else
   return false;
 #endif
 }
 
-bool OpenSSLStreamAdapter::IsTlsConnected() {
-  return state_ == SSL_CONNECTED;
-}
-
 int OpenSSLStreamAdapter::StartSSL() {
-  if (state_ != SSL_NONE) {
-    // Don't allow StartSSL to be called twice.
-    return -1;
-  }
+  ASSERT(state_ == SSL_NONE);
 
   if (StreamAdapterInterface::GetState() != SS_OPEN) {
     state_ = SSL_WAIT;
     return 0;
   }
 
   state_ = SSL_CONNECTING;
   if (int err = BeginSSL()) {
-    Error("BeginSSL", err, 0, false);
+    Error("BeginSSL", err, false);
     return err;
   }
 
   return 0;
 }
 
 void OpenSSLStreamAdapter::SetMode(SSLMode mode) {
-  RTC_DCHECK(state_ == SSL_NONE);
+  ASSERT(state_ == SSL_NONE);
   ssl_mode_ = mode;
 }
 
 void OpenSSLStreamAdapter::SetMaxProtocolVersion(SSLProtocolVersion version) {
-  RTC_DCHECK(ssl_ctx_ == NULL);
+  ASSERT(ssl_ctx_ == NULL);
   ssl_max_version_ = version;
 }
 
 //
 // StreamInterface Implementation
 //
 
 StreamResult OpenSSLStreamAdapter::Write(const void* data, size_t data_len,
                                          size_t* written, int* error) {
   LOG(LS_VERBOSE) << "OpenSSLStreamAdapter::Write(" << data_len << ")";
 
   switch (state_) {
   case SSL_NONE:
     // pass-through in clear text
     return StreamAdapterInterface::Write(data, data_len, written, error);
 
   case SSL_WAIT:
   case SSL_CONNECTING:
     return SR_BLOCK;
 
   case SSL_CONNECTED:
-    if (waiting_to_verify_peer_certificate_cert()) {
-      return SR_BLOCK;
-    }
     break;
 
   case SSL_ERROR:
   case SSL_CLOSED:
   default:
     if (error)
       *error = ssl_error_code_;
     return SR_ERROR;
   }
 
   // OpenSSL will return an error if we try to write zero bytes
   if (data_len == 0) {
     if (written)
       *written = 0;
     return SR_SUCCESS;
   }
 
   ssl_write_needs_read_ = false;
 
   int code = SSL_write(ssl_, data, checked_cast<int>(data_len));
   int ssl_error = SSL_get_error(ssl_, code);
   switch (ssl_error) {
   case SSL_ERROR_NONE:
     LOG(LS_VERBOSE) << " -- success";
-    RTC_DCHECK(0 < code && static_cast<unsigned>(code) <= data_len);
+    ASSERT(0 < code && static_cast<unsigned>(code) <= data_len);
     if (written)
       *written = code;
     return SR_SUCCESS;
   case SSL_ERROR_WANT_READ:
     LOG(LS_VERBOSE) << " -- error want read";
     ssl_write_needs_read_ = true;
     return SR_BLOCK;
   case SSL_ERROR_WANT_WRITE:
     LOG(LS_VERBOSE) << " -- error want write";
     return SR_BLOCK;
 
   case SSL_ERROR_ZERO_RETURN:
   default:
-    Error("SSL_write", (ssl_error ? ssl_error : -1), 0, false);
+    Error("SSL_write", (ssl_error ? ssl_error : -1), false);
     if (error)
       *error = ssl_error_code_;
     return SR_ERROR;
   }
   // not reached
 }
 
 StreamResult OpenSSLStreamAdapter::Read(void* data, size_t data_len,
                                         size_t* read, int* error) {
   LOG(LS_VERBOSE) << "OpenSSLStreamAdapter::Read(" << data_len << ")";
   switch (state_) {
     case SSL_NONE:
       // pass-through in clear text
       return StreamAdapterInterface::Read(data, data_len, read, error);
 
     case SSL_WAIT:
     case SSL_CONNECTING:
       return SR_BLOCK;
 
     case SSL_CONNECTED:
-      if (waiting_to_verify_peer_certificate_cert()) {
-        return SR_BLOCK;
-      }
       break;
 
     case SSL_CLOSED:
       return SR_EOS;
 
     case SSL_ERROR:
     default:
       if (error)
         *error = ssl_error_code_;
       return SR_ERROR;
   }
 
   // Don't trust OpenSSL with zero byte reads
   if (data_len == 0) {
     if (read)
       *read = 0;
     return SR_SUCCESS;
   }
 
   ssl_read_needs_write_ = false;
 
   int code = SSL_read(ssl_, data, checked_cast<int>(data_len));
   int ssl_error = SSL_get_error(ssl_, code);
   switch (ssl_error) {
     case SSL_ERROR_NONE:
       LOG(LS_VERBOSE) << " -- success";
-      RTC_DCHECK(0 < code && static_cast<unsigned>(code) <= data_len);
+      ASSERT(0 < code && static_cast<unsigned>(code) <= data_len);
       if (read)
         *read = code;
 
       if (ssl_mode_ == SSL_MODE_DTLS) {
         // Enforce atomic reads -- this is a short read
         unsigned int pending = SSL_pending(ssl_);
 
         if (pending) {
           LOG(LS_INFO) << " -- short DTLS read. flushing";
           FlushInput(pending);
           if (error)
             *error = SSE_MSG_TRUNC;
           return SR_ERROR;
         }
       }
       return SR_SUCCESS;
     case SSL_ERROR_WANT_READ:
       LOG(LS_VERBOSE) << " -- error want read";
       return SR_BLOCK;
     case SSL_ERROR_WANT_WRITE:
       LOG(LS_VERBOSE) << " -- error want write";
       ssl_read_needs_write_ = true;
       return SR_BLOCK;
     case SSL_ERROR_ZERO_RETURN:
       LOG(LS_VERBOSE) << " -- remote side closed";
-      Close();
+      // When we're closed at SSL layer, also close the stream level which
+      // performs necessary clean up. Otherwise, a new incoming packet after
+      // this could overflow the stream buffer.
+      this->stream()->Close();
       return SR_EOS;
       break;
     default:
       LOG(LS_VERBOSE) << " -- error " << code;
-      Error("SSL_read", (ssl_error ? ssl_error : -1), 0, false);
+      Error("SSL_read", (ssl_error ? ssl_error : -1), false);
       if (error)
         *error = ssl_error_code_;
       return SR_ERROR;
   }
   // not reached
 }
 
 void OpenSSLStreamAdapter::FlushInput(unsigned int left) {
   unsigned char buf[2048];
 
   while (left) {
     // This should always succeed
     int toread = (sizeof(buf) < left) ? sizeof(buf) : left;
     int code = SSL_read(ssl_, buf, toread);
 
     int ssl_error = SSL_get_error(ssl_, code);
-    RTC_DCHECK(ssl_error == SSL_ERROR_NONE);
+    ASSERT(ssl_error == SSL_ERROR_NONE);
 
     if (ssl_error != SSL_ERROR_NONE) {
       LOG(LS_VERBOSE) << " -- error " << code;
-      Error("SSL_read", (ssl_error ? ssl_error : -1), 0, false);
+      Error("SSL_read", (ssl_error ? ssl_error : -1), false);
       return;
     }
 
     LOG(LS_VERBOSE) << " -- flushed " << code << " bytes";
     left -= code;
   }
 }
 
 void OpenSSLStreamAdapter::Close() {
-  Cleanup(0);
-  RTC_DCHECK(state_ == SSL_CLOSED || state_ == SSL_ERROR);
-  // When we're closed at SSL layer, also close the stream level which
-  // performs necessary clean up. Otherwise, a new incoming packet after
-  // this could overflow the stream buffer.
+  Cleanup();
+  ASSERT(state_ == SSL_CLOSED || state_ == SSL_ERROR);
   StreamAdapterInterface::Close();
 }
 
 StreamState OpenSSLStreamAdapter::GetState() const {
   switch (state_) {
     case SSL_WAIT:
     case SSL_CONNECTING:
       return SS_OPENING;
     case SSL_CONNECTED:
-      if (waiting_to_verify_peer_certificate_cert()) {
-        return SS_OPENING;
-      }
       return SS_OPEN;
     default:
       return SS_CLOSED;
   };
   // not reached
 }
 
 void OpenSSLStreamAdapter::OnEvent(StreamInterface* stream, int events,
                                    int err) {
   int events_to_signal = 0;
   int signal_error = 0;
-  RTC_DCHECK(stream == this->stream());
+  ASSERT(stream == this->stream());
   if ((events & SE_OPEN)) {
     LOG(LS_VERBOSE) << "OpenSSLStreamAdapter::OnEvent SE_OPEN";
     if (state_ != SSL_WAIT) {
-      RTC_DCHECK(state_ == SSL_NONE);
+      ASSERT(state_ == SSL_NONE);
       events_to_signal |= SE_OPEN;
     } else {
       state_ = SSL_CONNECTING;
       if (int err = BeginSSL()) {
-        Error("BeginSSL", err, 0, true);
+        Error("BeginSSL", err, true);
         return;
       }
     }
   }
   if ((events & (SE_READ|SE_WRITE))) {
     LOG(LS_VERBOSE) << "OpenSSLStreamAdapter::OnEvent"
                  << ((events & SE_READ) ? " SE_READ" : "")
                  << ((events & SE_WRITE) ? " SE_WRITE" : "");
     if (state_ == SSL_NONE) {
       events_to_signal |= events & (SE_READ|SE_WRITE);
     } else if (state_ == SSL_CONNECTING) {
       if (int err = ContinueSSL()) {
-        Error("ContinueSSL", err, 0, true);
+        Error("ContinueSSL", err, true);
         return;
       }
     } else if (state_ == SSL_CONNECTED) {
       if (((events & SE_READ) && ssl_write_needs_read_) ||
           (events & SE_WRITE)) {
         LOG(LS_VERBOSE) << " -- onStreamWriteable";
         events_to_signal |= SE_WRITE;
       }
       if (((events & SE_WRITE) && ssl_read_needs_write_) ||
           (events & SE_READ)) {
         LOG(LS_VERBOSE) << " -- onStreamReadable";
         events_to_signal |= SE_READ;
       }
     }
   }
   if ((events & SE_CLOSE)) {
     LOG(LS_VERBOSE) << "OpenSSLStreamAdapter::OnEvent(SE_CLOSE, " << err << ")";
-    Cleanup(0);
+    Cleanup();
     events_to_signal |= SE_CLOSE;
     // SE_CLOSE is the only event that uses the final parameter to OnEvent().
-    RTC_DCHECK(signal_error == 0);
+    ASSERT(signal_error == 0);
     signal_error = err;
   }
   if (events_to_signal)
     StreamAdapterInterface::OnEvent(stream, events_to_signal, signal_error);
 }
 
 int OpenSSLStreamAdapter::BeginSSL() {
-  RTC_DCHECK(state_ == SSL_CONNECTING);
+  ASSERT(state_ == SSL_CONNECTING);
   // The underlying stream has opened.
+  // A peer certificate digest must have been specified by now.
+  ASSERT(!peer_certificate_digest_algorithm_.empty());
   LOG(LS_INFO) << "BeginSSL with peer.";
 
   BIO* bio = NULL;
 
   // First set up the context.
-  RTC_DCHECK(ssl_ctx_ == NULL);
+  ASSERT(ssl_ctx_ == NULL);
   ssl_ctx_ = SetupSSLContext();
   if (!ssl_ctx_)
     return -1;
 
   bio = BIO_new_stream(static_cast<StreamInterface*>(stream()));
   if (!bio)
     return -1;
 
   ssl_ = SSL_new(ssl_ctx_);
   if (!ssl_) {
@@ skipping 33 matching lines @@
   SSL_set_tmp_ecdh(ssl_, ecdh);
   EC_KEY_free(ecdh);
 #endif
 
   // Do the connect
   return ContinueSSL();
 }
 
 int OpenSSLStreamAdapter::ContinueSSL() {
   LOG(LS_VERBOSE) << "ContinueSSL";
-  RTC_DCHECK(state_ == SSL_CONNECTING);
+  ASSERT(state_ == SSL_CONNECTING);
 
   // 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)) {
     case SSL_ERROR_NONE:
       LOG(LS_VERBOSE) << " -- success";
-      // By this point, OpenSSL should have given us a certificate, or errored
-      // out if one was missing.
-      RTC_DCHECK(peer_certificate_ || !client_auth_enabled());
+
+      if (!SSLPostConnectionCheck(ssl_, NULL,
+                                  peer_certificate_digest_algorithm_)) {
+        LOG(LS_ERROR) << "TLS post connection check failed";
+        return -1;
+      }
 
       state_ = SSL_CONNECTED;
-      if (!waiting_to_verify_peer_certificate_cert()) {
-        // 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.
-        //
-        // Post the event asynchronously to unwind the stack. The
-        // caller of ContinueSSL may be the same object listening
-        // for these events and may not be prepared for reentrancy.
-        PostEvent(SE_OPEN | SE_READ | SE_WRITE, 0);
-      }
+      StreamAdapterInterface::OnEvent(stream(), SE_OPEN|SE_READ|SE_WRITE, 0);
       break;
 
     case SSL_ERROR_WANT_READ: {
         LOG(LS_VERBOSE) << " -- error want read";
         struct timeval timeout;
         if (DTLSv1_get_timeout(ssl_, &timeout)) {
           int delay = timeout.tv_sec * 1000 + timeout.tv_usec/1000;
 
           Thread::Current()->PostDelayed(RTC_FROM_HERE, delay, this,
                                          MSG_TIMEOUT, 0);
@@ skipping 13 matching lines @@
       if (err_code != 0 && ERR_GET_REASON(err_code) == SSL_R_NO_SHARED_CIPHER) {
         ssl_handshake_err = SSLHandshakeError::INCOMPATIBLE_CIPHERSUITE;
       }
       SignalSSLHandshakeError(ssl_handshake_err);
       return (ssl_error != 0) ? ssl_error : -1;
   }
 
   return 0;
 }
 
-void OpenSSLStreamAdapter::Error(const char* context,
-                                 int err,
-                                 uint8_t alert,
-                                 bool signal) {
-  LOG(LS_WARNING) << "OpenSSLStreamAdapter::Error(" << context << ", " << err
-                  << ", " << static_cast<int>(alert) << ")";
+void OpenSSLStreamAdapter::Error(const char* context, int err, bool signal) {
+  LOG(LS_WARNING) << "OpenSSLStreamAdapter::Error("
+                  << context << ", " << err << ")";
   state_ = SSL_ERROR;
   ssl_error_code_ = err;
-  Cleanup(alert);
+  Cleanup();
   if (signal)
     StreamAdapterInterface::OnEvent(stream(), SE_CLOSE, err);
 }
 
-void OpenSSLStreamAdapter::Cleanup(uint8_t alert) {
+void OpenSSLStreamAdapter::Cleanup() {
   LOG(LS_INFO) << "Cleanup";
 
   if (state_ != SSL_ERROR) {
     state_ = SSL_CLOSED;
     ssl_error_code_ = 0;
   }
 
   if (ssl_) {
-    int ret;
-// SSL_send_fatal_alert is only available in BoringSSL.
-#ifdef OPENSSL_IS_BORINGSSL
-    if (alert) {
-      ret = SSL_send_fatal_alert(ssl_, alert);
-      if (ret < 0) {
-        LOG(LS_WARNING) << "SSL_send_fatal_alert failed, error = "
-                        << SSL_get_error(ssl_, ret);
-      }
-    } else {
-#endif
-      ret = SSL_shutdown(ssl_);
-      if (ret < 0) {
-        LOG(LS_WARNING) << "SSL_shutdown failed, error = "
-                        << SSL_get_error(ssl_, ret);
-      }
-#ifdef OPENSSL_IS_BORINGSSL
+    int ret = SSL_shutdown(ssl_);
+    if (ret < 0) {
+      LOG(LS_WARNING) << "SSL_shutdown failed, error = "
+                      << SSL_get_error(ssl_, ret);
     }
-#endif
+
     SSL_free(ssl_);
     ssl_ = NULL;
   }
   if (ssl_ctx_) {
     SSL_CTX_free(ssl_ctx_);
     ssl_ctx_ = NULL;
   }
   identity_.reset();
   peer_certificate_.reset();
 
@@ skipping 137 matching lines @@
     if (SSL_CTX_set_tlsext_use_srtp(ctx, srtp_ciphers_.c_str())) {
       SSL_CTX_free(ctx);
       return NULL;
     }
   }
 #endif
 
   return ctx;
 }
 
-bool OpenSSLStreamAdapter::VerifyPeerCertificate() {
-  if (!has_peer_certificate_digest() || !peer_certificate_) {
-    LOG(LS_WARNING) << "Missing digest or peer certificate.";
-    return false;
-  }
-
-  unsigned char digest[EVP_MAX_MD_SIZE];
-  size_t digest_length;
-  if (!OpenSSLCertificate::ComputeDigest(
-          peer_certificate_->x509(), peer_certificate_digest_algorithm_, digest,
-          sizeof(digest), &digest_length)) {
-    LOG(LS_WARNING) << "Failed to compute peer cert digest.";
-    return false;
-  }
-
-  Buffer computed_digest(digest, digest_length);
-  if (computed_digest != peer_certificate_digest_value_) {
-    LOG(LS_WARNING) << "Rejected peer certificate due to mismatched digest.";
-    return 0;
-  }
-  // Ignore any verification error if the digest matches, since there is no
-  // value in checking the validity of a self-signed cert issued by untrusted
-  // sources.
-  LOG(LS_INFO) << "Accepted peer certificate.";
-  peer_certificate_verified_ = true;
-  return true;
-}
-
 int OpenSSLStreamAdapter::SSLVerifyCallback(int ok, X509_STORE_CTX* store) {
   // Get our SSL structure from the store
-  SSL* ssl = reinterpret_cast<SSL*>(
-      X509_STORE_CTX_get_ex_data(store, SSL_get_ex_data_X509_STORE_CTX_idx()));
+  SSL* ssl = reinterpret_cast<SSL*>(X509_STORE_CTX_get_ex_data(
+                                        store,
+                                        SSL_get_ex_data_X509_STORE_CTX_idx()));
+  OpenSSLStreamAdapter* stream =
+    reinterpret_cast<OpenSSLStreamAdapter*>(SSL_get_app_data(ssl));
+
+  if (stream->peer_certificate_digest_algorithm_.empty()) {
+    return 0;
+  }
   X509* cert = X509_STORE_CTX_get_current_cert(store);
   int depth = X509_STORE_CTX_get_error_depth(store);
 
-  // For now we ignore the parent certificates and verify the leaf against
+  // For now We ignore the parent certificates and verify the leaf against
   // the digest.
   //
   // TODO(jiayl): Verify the chain is a proper chain and report the chain to
   // |stream->peer_certificate_|.
   if (depth > 0) {
     LOG(LS_INFO) << "Ignored chained certificate at depth " << depth;
     return 1;
   }
 
-  OpenSSLStreamAdapter* stream =
-      reinterpret_cast<OpenSSLStreamAdapter*>(SSL_get_app_data(ssl));
+  unsigned char digest[EVP_MAX_MD_SIZE];
+  size_t digest_length;
+  if (!OpenSSLCertificate::ComputeDigest(
+           cert,
+           stream->peer_certificate_digest_algorithm_,
+           digest, sizeof(digest),
+           &digest_length)) {
+    LOG(LS_WARNING) << "Failed to compute peer cert digest.";
+    return 0;
+  }
+
+  Buffer computed_digest(digest, digest_length);
+  if (computed_digest != stream->peer_certificate_digest_value_) {
+    LOG(LS_WARNING) << "Rejected peer certificate due to mismatched digest.";
+    return 0;
+  }
+  // Ignore any verification error if the digest matches, since there is no
+  // value in checking the validity of a self-signed cert issued by untrusted
+  // sources.
+  LOG(LS_INFO) << "Accepted peer certificate.";
 
   // Record the peer's certificate.
   stream->peer_certificate_.reset(new OpenSSLCertificate(cert));
+  return 1;
+}
 
-  // If the peer certificate digest isn't known yet, we'll wait to verify
-  // until it's known, and for now just return a success status.
-  if (stream->peer_certificate_digest_algorithm_.empty()) {
-    LOG(LS_INFO) << "Waiting to verify certificate until digest is known.";
-    return 1;
-  }
-
-  return stream->VerifyPeerCertificate();
+bool OpenSSLStreamAdapter::SSLPostConnectionCheck(SSL* ssl,
+                                                  const X509* peer_cert,
+                                                  const std::string
+                                                  &peer_digest) {
+  ASSERT((peer_cert != NULL) || (!peer_digest.empty()));
+  return true;
 }
 
 bool OpenSSLStreamAdapter::HaveDtls() {
   return true;
 }
 
 bool OpenSSLStreamAdapter::HaveDtlsSrtp() {
 #ifdef HAVE_DTLS_SRTP
   return true;
 #else
@@ skipping 84 matching lines @@
         return true;
     }
   }
 
   return false;
 }
 
 }  // namespace rtc
 
 #endif  // HAVE_OPENSSL_SSL_H