Remove libressl version checks

If someone wants to contribute checks which use actual LibreSSL version numbers, so we're not stuck supporting the initial API version of LibreSSL at the point it was forked from OpenSSL, then they're welcome to do so, otherwise we will not continue to support these lazy, short sighted hacks.

diff --git a/src/lib/tls/missing.h b/src/lib/tls/missing.h
index 5cae7e0a07246defe6f6a6640be8d8efd01cd982..4865020000b38971fac69b83f85dd4ef2a3cd53d 100644 (file)
--- a/src/lib/tls/missing.h
+++ b/src/lib/tls/missing.h
@@ -17,7 +17,7 @@
 #include <openssl/opensslv.h>
 #include <openssl/ssl.h>
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 #  define EVP_MD_CTX_new       EVP_MD_CTX_create
 #  define EVP_MD_CTX_free      EVP_MD_CTX_destroy
 #  define EVP_MD_CTX_reset     EVP_MD_CTX_cleanup

diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c
index 2d2ea5263dce8f9979d7f59faf6b80c919b02851..93f2edf6313ec98b261438fe3ba0ce228c62aac3 100644 (file)
--- a/src/lib/tls/session.c
+++ b/src/lib/tls/session.c
@@ -1039,7 +1039,7 @@ int tls_session_pairs_from_x509_cert(fr_cursor_t *cursor, TALLOC_CTX *ctx,
         *      Only add extensions for the actual client certificate
         */
        if (attr_index == 0) {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
                ext_list = X509_get0_extensions(cert);
 #else
                ext_list = cert->cert_info->extensions;

diff --git a/src/lib/tls/utils.c b/src/lib/tls/utils.c
index 10a8b4f6bc15cc9751fa6a1f7cc0af5595b6d1e5..4f3e185415ad47deb49416dc7e8a05ce47a50463 100644 (file)
--- a/src/lib/tls/utils.c
+++ b/src/lib/tls/utils.c
@@ -85,7 +85,7 @@ int tls_utils_keyblock_size_get(REQUEST *request, SSL *ssl)
 {
        const EVP_CIPHER *c;
        const EVP_MD *h;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
        int md_size;
 
        if (ssl->enc_read_ctx == NULL || ssl->enc_read_ctx->cipher == NULL || ssl->read_hash == NULL)

diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c
index dcf15fb8ad3225f99c5859dc59a515315a462b9a..7de179a5575cda3bf5f4e714d233b4a1d25f7e2e 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c
@@ -273,7 +273,7 @@ static void eap_fast_session_ticket(tls_session_t *tls_session, const SSL *s,
 }
 
 // hostap:src/crypto/tls_openssl.c:tls_sess_sec_cb()
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 static int _session_secret(SSL *s, void *secret, int *secret_len,
                           UNUSED STACK_OF(SSL_CIPHER) *peer_ciphers,
                           UNUSED SSL_CIPHER **cipher, void *arg)