From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 5 May 2019 15:20:31 +0000 (+0100)
Subject: OpenSSL: for older library (1.0.2) assume that a ticket callback in client only
X-Git-Tag: exim-4.93-RC0~207
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=40618fb66f6d7e88e54148f8745cfdf878c80990;p=exim.git

OpenSSL: for older library (1.0.2) assume that a ticket callback in client only
happens for a resumable session
---

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index c40af65c7..4b3847712 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -2544,7 +2544,7 @@ DEBUG(D_tls)
 #ifdef EXIM_HAVE_SESSION_TICKET
   {
   SSL_SESSION * ss = SSL_get_session(server_ssl);
-  if (SSL_SESSION_has_ticket(ss))
+  if (SSL_SESSION_has_ticket(ss))	/* 1.1.0 */
     debug_printf("The session has a ticket, life %lu seconds\n",
       SSL_SESSION_get_ticket_lifetime_hint(ss));
   }
@@ -2749,9 +2749,9 @@ DEBUG(D_tls) debug_printf("tls_save_session_cb\n");
 
 if (!cbinfo || !(tlsp = cbinfo->tlsp)->host_resumable) return 0;
 
-# ifdef EXIM_HAVE_SESSION_TICKET
-
-if (SSL_SESSION_is_resumable(ss)) 
+# ifdef OPENSSL_HAVE_NUM_TICKETS
+if (SSL_SESSION_is_resumable(ss)) 	/* 1.1.1 */
+# endif
   {
   int len = i2d_SSL_SESSION(ss, NULL);
   int dlen = sizeof(dbdata_tls_session) + len;
@@ -2774,7 +2774,6 @@ if (SSL_SESSION_is_resumable(ss))
 		  (unsigned)dlen);
     }
   }
-# endif
 return 1;
 }