[exim-cvs] OpenSSL: for older library (1.0.2) assume that a …

Commit:     40618fb66f6d7e88e54148f8745cfdf878c80990
Parent:     4d93129fffa7e0f92b83ebca52fc188f4d13d6e6
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun May 5 16:20:31 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun May 5 19:14:56 2019 +0100

    OpenSSL: for older library (1.0.2) assume that a ticket callback in client only
    happens for a resumable session
---
 src/src/tls-openssl.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index c40af65..4b38477 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");

-# 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;
 }