diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-03-21 16:10:05 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2012-03-21 16:19:53 -0700 |
| commit | 731158395b8ae1105c69cc42dae6244385f6b4ff (patch) | |
| tree | bc86ca043296cb2eec389c376a33c944b2514261 /net | |
| parent | b2197cae52338e04bb2b7911faae7bab57fcc7bc (diff) | |
| download | external_chromium-731158395b8ae1105c69cc42dae6244385f6b4ff.zip external_chromium-731158395b8ae1105c69cc42dae6244385f6b4ff.tar.gz external_chromium-731158395b8ae1105c69cc42dae6244385f6b4ff.tar.bz2 | |
Make SSL_CIPHER_get_id definition conditional on OpenSSL version
Change-Id: I7a28fe9753e12fc3f597b0938de88130f50918ee
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 70ede09..b9c3e02 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -42,6 +42,11 @@ const size_t kMaxRecvBufferSize = 4096; const int kSessionCacheTimeoutSeconds = 60 * 60; const size_t kSessionCacheMaxEntires = 1024; +#if OPENSSL_VERSION_NUMBER < 0x1000100fL +// This method was first included in OpenSSL 1.0.1. +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, int compression, |