diff options
| author | digit@chromium.org <digit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 06:30:17 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 06:30:17 +0000 |
| commit | 89038151153d33b29cb2164f11b9a58774a9115b (patch) | |
| tree | 865bbdf6a6cbbee3af62f7ab7eb6d03bc3440ab0 /net/socket | |
| parent | 1a113d35a19c0ed6500fb5c0acdc35730617fb3f (diff) | |
| download | chromium_src-89038151153d33b29cb2164f11b9a58774a9115b.zip chromium_src-89038151153d33b29cb2164f11b9a58774a9115b.tar.gz chromium_src-89038151153d33b29cb2164f11b9a58774a9115b.tar.bz2 | |
Prepare for OpenSSL 1.0.1c update.
A future patch to third_party/openssl/ will update the library to version 1.0.1c.
This net/socket/ patch is to avoid a trivial build breakage when the update is rolled.
BUG=112445
Review URL: https://chromiumcodereview.appspot.com/10918099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 61ab8d1..bdb9626 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -9,6 +9,7 @@ #include <openssl/ssl.h> #include <openssl/err.h> +#include <openssl/opensslv.h> #include "base/bind.h" #include "base/memory/singleton.h" @@ -46,8 +47,10 @@ const size_t kSessionCacheMaxEntires = 1024; // the server supports NPN, choosing "http/1.1" is the best answer. const char kDefaultSupportedNPNProtocol[] = "http/1.1"; -// This method doesn't seemed to have made it into the OpenSSL headers. +#if OPENSSL_VERSION_NUMBER < 0x1000103fL +// This method doesn't seem to have made it into the OpenSSL headers. unsigned long SSL_CIPHER_get_id(const SSL_CIPHER* cipher) { return cipher->id; } +#endif // Used for encoding the |connection_status| field of an SSLInfo object. int EncodeSSLConnectionStatus(int cipher_suite, |