View | Details | Raw Unified | Return to bug 237216 | Differences between
and this patch

Collapse All | Expand All

(-)files/patch-src_main_tls.c (working copy) (+28 lines)
Line 0 Link Here
1
--- src/main/tls.c.orig        2019-04-12 06:47:56 UTC
2
+++ src/main/tls.c
3
@@ -1579,7 +1579,7 @@ done:
4
       return 0;
5
 }
6
 
7
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
8
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
9
 static SSL_SESSION *cbtls_get_session(SSL *ssl, unsigned char *data, int len, int *copy)
10
 #else
11
 static SSL_SESSION *cbtls_get_session(SSL *ssl, const unsigned char *data, int len, int *copy)
12
@@ -3379,14 +3379,14 @@ post_ca:
13
                */
14
               SSL_CTX_sess_set_cache_size(ctx, conf->session_cache_size);
15
 
16
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
17
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
18
               SSL_CTX_set_num_tickets(ctx, 1);
19
 #endif
20
 
21
       } else {
22
               SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
23
 
24
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
25
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
26
               /*
27
                *      This controls the number of stateful or stateless tickets
28
                *      generated with TLS 1.3.  In OpenSSL 1.1.1 it's also

Return to bug 237216