diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 17:59:10 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 17:59:10 +0000 |
commit | 2126ceff10266d71675244ba89c6a7951cfb3d8b (patch) | |
tree | 8d161378853a3ac9965098fd3da3f7ff1511ce24 /remoting/host/token_validator_base.cc | |
parent | 791733d3dbc0dc80ba00b70a8c18ebaf2c2af812 (diff) | |
download | chromium_src-2126ceff10266d71675244ba89c6a7951cfb3d8b.zip chromium_src-2126ceff10266d71675244ba89c6a7951cfb3d8b.tar.gz chromium_src-2126ceff10266d71675244ba89c6a7951cfb3d8b.tar.bz2 |
Switch to BoringSSL.
(This is a reland of r283542 which was reverted in r283591 because it
broke the WebView build. The android_aosp trybots are broken[1] so this
based on hope.)
This is a much larger change than its diff suggests. If it breaks
something, please revert first and ask questions later.
[1] http://code.google.com/p/chromium/issues/detail?id=394597
BUG=none
Review URL: https://codereview.chromium.org/399993002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/token_validator_base.cc')
-rw-r--r-- | remoting/host/token_validator_base.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/host/token_validator_base.cc b/remoting/host/token_validator_base.cc index 8a5c2c3..452a182 100644 --- a/remoting/host/token_validator_base.cc +++ b/remoting/host/token_validator_base.cc @@ -120,6 +120,9 @@ void TokenValidatorBase::OnCertificateRequested( client_cert_store = new net::ClientCertStoreWin(); #elif defined(OS_MACOSX) client_cert_store = new net::ClientCertStoreMac(); +#elif defined(USE_OPENSSL) + // OpenSSL does not use the ClientCertStore infrastructure. + client_cert_store = NULL; #else #error Unknown platform. #endif |