Merged from trunk rev.14734

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

diff --cc src/security/Session.cc
index 38480c14385b0f560c5b517e5ba149eeb440ee4f,ae6fc3c919eeb260b9cea0cdcbeebc124cd8acdf..e9f1efeacdc91854e3cf31bd8edc2cf074db09e0
--- 1/src/security/Session.cc
--- 2/src/security/Session.cc
+++ b/src/security/Session.cc
@@@ -16,6 -16,45 +16,52 @@@
  #define SSL_SESSION_ID_SIZE 32
  #define SSL_SESSION_MAX_SIZE 10*1024
  
++#if USE_GNUTLS
++void
++squid_datum_free(gnutls_datum_t *D) {
++    gnutls_free(D);
++}
++#endif
++
+ bool
+ Security::SessionIsResumed(const Security::SessionPointer &s)
+ {
+     return
+ #if USE_OPENSSL
+         SSL_session_reused(s.get()) == 1;
+ #elif USE_GNUTLS
+         gnutls_session_is_resumed(s.get()) != 0;
+ #else
+         false;
+ #endif
+ }
+ 
+ void
+ Security::GetSessionResumeData(const Security::SessionPointer &s, Security::SessionStatePointer &data)
+ {
+     if (!SessionIsResumed(s)) {
+ #if USE_OPENSSL
+         data.reset(SSL_get1_session(s.get()));
+ #elif USE_GNUTLS
+         gnutls_datum_t *tmp = nullptr;
+         (void)gnutls_session_get_data2(s.get(), tmp);
+         data.reset(tmp);
+ #endif
+     }
+ }
+ 
+ void
+ Security::SetSessionResumeData(const Security::SessionPtr &s, const Security::SessionStatePointer &data)
+ {
+     if (s) {
+ #if USE_OPENSSL
+         (void)SSL_set_session(s, data.get());
+ #elif USE_GNUTLS
+         (void)gnutls_session_set_data(s, data->data, data->size);
+ #endif
+     }
+ }
+ 
  static bool
  isTlsServer()
  {

diff --cc src/security/Session.h
index fb009df20f15bbef5502667ebe0a74f67d2719de,b360967b377b083d9ec44f9b3a25506f89c03d85..fae3b4c247f53f4bb0be7fa7d2b1bf7d45657d5c
--- 1/src/security/Session.h
--- 2/src/security/Session.h
+++ b/src/security/Session.h
@@@ -32,24 -31,41 +32,40 @@@ typedef SSL* SessionPtr
  CtoCpp1(SSL_free, SSL *);
  typedef LockingPointer<SSL, Security::SSL_free_cpp, CRYPTO_LOCK_SSL> SessionPointer;
  
 -typedef SSL_SESSION* SessionStatePtr;
 -CtoCpp1(SSL_SESSION_free, SSL_SESSION *);
 -typedef LockingPointer<SSL_SESSION, Security::SSL_SESSION_free_cpp, CRYPTO_LOCK_SSL_SESSION> SessionStatePointer;
++typedef std::unique_ptr<SSL_SESSION, std::function<decltype(SSL_SESSION_free)>> SessionStatePointer;
+ 
  #elif USE_GNUTLS
  typedef gnutls_session_t SessionPtr;
 -CtoCpp1(gnutls_deinit, gnutls_session_t);
--// TODO: Convert to Locking pointer.
  // Locks can be implemented attaching locks counter to gnutls_session_t
  // objects using the gnutls_session_set_ptr()/gnutls_session_get_ptr ()
  // library functions
- //typedef std::unique_ptr<struct gnutls_session_int, std::function<decltype(gnutls_deinit)>> SessionPointer;
 -typedef TidyPointer<struct gnutls_session_int, Security::gnutls_deinit_cpp> SessionPointer;
 +CtoCpp1(gnutls_deinit, gnutls_session_t);
 +typedef LockingPointer<struct gnutls_session_int, gnutls_deinit_cpp, -1> SessionPointer;
  
 -typedef gnutls_datum_t *SessionStatePtr;
 -CtoCpp1(gnutls_free, gnutls_datum_t *);
 -typedef TidyPointer<gnutls_datum_t, Security::gnutls_free_cpp> SessionStatePointer;
++/// wrapper function to avoid compile errors with gnutls_free() being a typedef.
++void squid_datum_free(gnutls_datum_t *D);
++typedef std::unique_ptr<gnutls_datum_t, std::function<decltype(squid_datum_free)>> SessionStatePointer;
+ 
  #else
  // use void* so we can check against NULL
  typedef void* SessionPtr;
 -typedef TidyPointer<void, nullptr> SessionPointer;
 -typedef TidyPointer<void, nullptr> SessionStatePointer;
 +CtoCpp1(xfree, SessionPtr);
 +typedef LockingPointer<void, xfree_cpp, -1> SessionPointer;
 +
++typedef std::unique_ptr<int> SessionStatePointer;
+ 
  #endif
  
+ /// whether the session is a resumed one
+ bool SessionIsResumed(const Security::SessionPointer &);
+ 
+ /// Retrieve the data needed to resume this session on a later connection
+ void GetSessionResumeData(const Security::SessionPointer &, Security::SessionStatePointer &);
+ 
+ /// Set the data for resuming a previous session.
+ /// Needs to be done before using the SessionPointer for a handshake.
+ void SetSessionResumeData(const Security::SessionPtr &, const Security::SessionStatePointer &);
+ 
  } // namespace Security
  
  #endif /* SQUID_SRC_SECURITY_SESSION_H */

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