Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: webrtc/base/opensslstreamadapter.h

Issue 2163683003: Relanding: Allow the DTLS fingerprint verification to occur after the handshake. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing comment line wrapping. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/base/opensslstreamadapter.cc » ('j') | webrtc/base/opensslstreamadapter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/opensslstreamadapter.h
diff --git a/webrtc/base/opensslstreamadapter.h b/webrtc/base/opensslstreamadapter.h
index 05e81021696162b626029bf2a9d723475305665c..017ccaaa8b1a6616f5c6fbac1b7d485c206c9da5 100644
--- a/webrtc/base/opensslstreamadapter.h
+++ b/webrtc/base/opensslstreamadapter.h
@@ -107,6 +107,8 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
bool SetDtlsSrtpCryptoSuites(const std::vector<int>& crypto_suites) override;
bool GetDtlsSrtpCryptoSuite(int* crypto_suite) override;
+ bool IsTlsConnected() override { return state_ == SSL_CONNECTED; }
+
// Capabilities interfaces
static bool HaveDtls();
static bool HaveDtlsSrtp();
@@ -165,9 +167,10 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
// SSL library configuration
SSL_CTX* SetupSSLContext();
// SSL verification check
- bool SSLPostConnectionCheck(SSL* ssl, const char* server_name,
- const X509* peer_cert,
- const std::string& peer_digest);
+ bool SSLPostConnectionCheck(SSL* ssl,
+ const char* server_name,
+ const X509* peer_cert);
+ bool VerifyPeerCertificate();
// SSL certification verification error handler, called back from
// the openssl library. Returns an int interpreted as a boolean in
// the C style: zero means verification failure, non-zero means
@@ -197,6 +200,7 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
// the peer must present.
Buffer peer_certificate_digest_value_;
std::string peer_certificate_digest_algorithm_;
+ bool certificate_verified_ = false;
// OpenSSLAdapter::custom_verify_callback_ result
bool custom_verification_succeeded_;
« no previous file with comments | « no previous file | webrtc/base/opensslstreamadapter.cc » ('j') | webrtc/base/opensslstreamadapter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698