Skip to content
Permalink
Browse files
Make SSL_CIPHER_get_id definition conditional on OpenSSL version
Change-Id: I7a28fe9753e12fc3f597b0938de88130f50918ee
  • Loading branch information
bdcgoogle committed Mar 21, 2012
1 parent b2197ca commit 731158395b8ae1105c69cc42dae6244385f6b4ff
Showing with 5 additions and 0 deletions.
  1. +5 −0 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,

0 comments on commit 7311583

Please sign in to comment.