diff options
| author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 20:27:14 +0000 |
|---|---|---|
| committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 20:27:14 +0000 |
| commit | 09ac0db93bf70afdb1e7fece9048fd48841b4151 (patch) | |
| tree | d9fdef93c041fc74cf71bed04edd4a7fc130b224 /net/socket/ssl_client_socket.h | |
| parent | 8393c30362716313ccc200e7c11c761eb0a42982 (diff) | |
| download | chromium_src-09ac0db93bf70afdb1e7fece9048fd48841b4151.zip chromium_src-09ac0db93bf70afdb1e7fece9048fd48841b4151.tar.gz chromium_src-09ac0db93bf70afdb1e7fece9048fd48841b4151.tar.bz2 | |
Revert of https://codereview.chromium.org/92443002/
Reason for revert: Does not compile on CrOS amd64
net/cert/ct_objects_extractor_nss.cc:528:66: error: narrowing conversion (...)
from 'std::basic_string<char>::size_type {aka long unsigned int}' to 'unsigned int'
inside { } is ill-formed in C++11 [-Werror=narrowing]
ocsp_response.data())), ocsp_response.size() };
TBR=wtc@chromium.org,rsleevi@chromium.org,ekasper@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/108113006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket.h')
| -rw-r--r-- | net/socket/ssl_client_socket.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h index 410062d..40840e4 100644 --- a/net/socket/ssl_client_socket.h +++ b/net/socket/ssl_client_socket.h @@ -7,7 +7,6 @@ #include <string> -#include "base/gtest_prod_util.h" #include "net/base/completion_callback.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" @@ -132,15 +131,18 @@ class NET_EXPORT SSLClientSocket : public SSLSocket { // Public for ssl_client_socket_openssl_unittest.cc. virtual bool WasChannelIDSent() const; + // Returns true if the server sent Certificate Transparency SCTs + // via a TLS extension. + // Temporary glue for testing while the CT code hasn't landed. + // TODO(ekasper): expose received SCTs via SSLInfo instead. + virtual bool WereSignedCertTimestampsReceived() const; + protected: virtual void set_channel_id_sent(bool channel_id_sent); virtual void set_signed_cert_timestamps_received( bool signed_cert_timestamps_received); - virtual void set_stapled_ocsp_response_received( - bool stapled_ocsp_response_received); - // Records histograms for channel id support during full handshakes - resumed // handshakes are ignored. static void RecordChannelIDSupport( @@ -155,14 +157,6 @@ class NET_EXPORT SSLClientSocket : public SSLSocket { ServerBoundCertService* server_bound_cert_service); private: - // For signed_cert_timestamps_received_ and stapled_ocsp_response_received_. - FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest, - ConnectSignedCertTimestampsEnabledTLSExtension); - FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest, - ConnectSignedCertTimestampsEnabledOCSP); - FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest, - ConnectSignedCertTimestampsDisabled); - // True if NPN was responded to, independent of selecting SPDY or HTTP. bool was_npn_negotiated_; // True if NPN successfully negotiated SPDY. @@ -173,8 +167,6 @@ class NET_EXPORT SSLClientSocket : public SSLSocket { bool channel_id_sent_; // True if SCTs were received via a TLS extension. bool signed_cert_timestamps_received_; - // True if a stapled OCSP response was received. - bool stapled_ocsp_response_received_; }; } // namespace net |