Merged from v5 r15006

diff --cc src/Makefile.am
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/comm.cc
Simple merge

diff --cc src/security/BlindPeerConnector.cc
Simple merge

diff --cc src/security/PeerConnector.cc
Simple merge

diff --cc src/security/PeerOptions.cc
Simple merge

diff --cc src/security/PeerOptions.h
Simple merge

diff --cc src/security/Session.cc
Simple merge

diff --cc src/security/Session.h
Simple merge

diff --cc src/security/forward.h
Simple merge

diff --cc src/ssl/PeekingPeerConnector.cc
Simple merge

diff --cc src/ssl/bio.cc
index dbc882579681cf3b5e66212a6e74eba655b3571f,b016085a759a16f165396309c359ab87f18e06fc..fb1592da60223bcc678237fa749899d35ddfeb01
--- 1/src/ssl/bio.cc
--- 2/src/ssl/bio.cc
+++ b/src/ssl/bio.cc
@@@ -62,13 -62,10 +62,10 @@@ static BIO_METHOD *SquidMethods = NULL
  #endif
  
  BIO *
 -Ssl::Bio::Create(const int fd, Ssl::Bio::Type type)
 +Ssl::Bio::Create(const int fd, Security::Io::Type type)
  {
  #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-     if (BIO *bio = BIO_new(&SquidMethods)) {
-         BIO_int_ctrl(bio, BIO_C_SET_FD, type, fd);
-         return bio;
-     }
+     BIO_METHOD *useMethod = &SquidMethods;
  #else
      if (!SquidMethods) {
          SquidMethods = BIO_meth_new(BIO_TYPE_SOCKET, "squid");

diff --cc src/ssl/bio.h
Simple merge

diff --cc src/ssl/cert_validate_message.cc
Simple merge

diff --cc src/ssl/cert_validate_message.h
Simple merge

diff --cc src/ssl/helper.cc
Simple merge

diff --cc src/ssl/support.cc
index 07d1434ea3669b67c1a6aa3bffdbb761385999a7,08a9eb1b0128bfb1af0dcf035ec1801fd725be96..1c218fed75dd830aaa684560057f190f6f82c23e
--- 1/src/ssl/support.cc
--- 2/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@@ -494,11 -525,9 +525,9 @@@ static boo
  configureSslContext(Security::ContextPointer &ctx, AnyP::PortCfg &port)
  {
      int ssl_error;
 -    SSL_CTX_set_options(ctx.get(), port.secure.parsedOptions);
 +    SSL_CTX_set_options(ctx.get(), *port.secure.parsedOptions);
  
- #if defined(SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
-     SSL_CTX_set_info_callback(ctx.get(), ssl_info_cb);
- #endif
+     maybeDisableRenegotiate(ctx);
  
      if (port.sslContextSessionId)
          SSL_CTX_set_session_id_context(ctx.get(), (const unsigned char *)port.sslContextSessionId, strlen(port.sslContextSessionId));
@@@ -626,9 -654,9 +654,7 @@@ Ssl::InitClientContext(Security::Contex
      if (!ctx)
          return false;
  
- #if defined(SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
-     SSL_CTX_set_info_callback(ctx.get(), ssl_info_cb);
- #endif
 -    SSL_CTX_set_options(ctx.get(), options);
 -
+     maybeDisableRenegotiate(ctx);
  
      if (!peer.sslCipher.isEmpty()) {
          debugs(83, 5, "Using chiper suite " << peer.sslCipher << ".");

diff --cc src/ssl/support.h
Simple merge

diff --cc src/tests/stub_libsecurity.cc
Simple merge

diff --cc src/tests/stub_libsslsquid.cc
Simple merge