42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
--- src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c 2018-04-17 19:12:27.000000000 +0200
|
|
+++ src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c 2019-04-27 16:56:01.628410415 +0200
|
|
@@ -44,7 +44,7 @@
|
|
{
|
|
const EVP_CIPHER *c;
|
|
const EVP_MD *h;
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
int md_size;
|
|
|
|
if (ssl->enc_read_ctx == NULL || ssl->enc_read_ctx->cipher == NULL ||
|
|
diff --git src/main/tls.c src/main/tls.c
|
|
index db73399..3a64534 100644
|
|
--- src/main/tls.c
|
|
+++ src/main/tls.c
|
|
@@ -1565,7 +1565,7 @@ done:
|
|
return 0;
|
|
}
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
static SSL_SESSION *cbtls_get_session(SSL *ssl, unsigned char *data, int len, int *copy)
|
|
#else
|
|
static SSL_SESSION *cbtls_get_session(SSL *ssl, const unsigned char *data, int len, int *copy)
|
|
@@ -3394,14 +3394,14 @@ post_ca:
|
|
*/
|
|
SSL_CTX_sess_set_cache_size(ctx, conf->session_cache_size);
|
|
|
|
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
|
|
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
SSL_CTX_set_num_tickets(ctx, 1);
|
|
#endif
|
|
|
|
} else {
|
|
SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
|
|
|
|
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
|
|
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
/*
|
|
* This controls the number of stateful or stateless tickets
|
|
* generated with TLS 1.3. In OpenSSL 1.1.1 it's also
|