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 /net/tools/flip_server | |
| 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 'net/tools/flip_server')
| -rw-r--r-- | net/tools/flip_server/acceptor_thread.cc | 1 | ||||
| -rw-r--r-- | net/tools/flip_server/spdy_ssl.cc | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/net/tools/flip_server/acceptor_thread.cc b/net/tools/flip_server/acceptor_thread.cc index 5dfece1..2b65e5d 100644 --- a/net/tools/flip_server/acceptor_thread.cc +++ b/net/tools/flip_server/acceptor_thread.cc @@ -4,6 +4,7 @@ #include "net/tools/flip_server/acceptor_thread.h" +#include <errno.h> #include <netinet/in.h> #include <netinet/tcp.h> // For TCP_NODELAY #include <sys/socket.h> diff --git a/net/tools/flip_server/spdy_ssl.cc b/net/tools/flip_server/spdy_ssl.cc index 2a5cb0e..19ea52e 100644 --- a/net/tools/flip_server/spdy_ssl.cc +++ b/net/tools/flip_server/spdy_ssl.cc @@ -80,6 +80,7 @@ void InitSSL(SSLState* state, SSL_CTX_set_mode(state->ssl_ctx, SSL_MODE_RELEASE_BUFFERS); #endif +#if !defined(OPENSSL_IS_BORINGSSL) // Proper methods to disable compression don't exist until 0.9.9+. For now // we must manipulate the stack of compression methods directly. if (disable_ssl_compression) { @@ -90,6 +91,7 @@ void InitSSL(SSLState* state, static_cast<void>(sk_SSL_COMP_delete(ssl_comp_methods, i)); } } +#endif } SSL* CreateSSLContext(SSL_CTX* ssl_ctx) { |