Accomodate consts added in OpenSSL 1.1

Update some declarations to use const to match respective changes in
OpenSSL 1.1 and not produce build warnings.

diff --git a/src/main/tls.c b/src/main/tls.c
index 0f983d1..692bab7 100644 (file)
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -1412,7 +1412,11 @@ error:
        return 0;
 }
 
+#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)
+#endif
 {
        size_t                  size;
        char                    buffer[2 * MAX_SESSION_SIZE + 1];
@@ -1911,7 +1915,11 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
        char            cn_str[1024];
        char            buf[64];
        X509            *client_cert;
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+       const STACK_OF(X509_EXTENSION) *ext_list;
+#else
        STACK_OF(X509_EXTENSION) *ext_list;
+#endif
        SSL             *ssl;
        int             err, depth, lookup, loc;
        fr_tls_server_conf_t *conf;

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 2a5c7c4..6fbb881 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
@@ -185,9 +185,15 @@ static void eap_fast_session_ticket(tls_session_t *tls_session, uint8_t *client_
 }
 
 // hostap:src/crypto/tls_openssl.c:tls_sess_sec_cb()
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 static int _session_secret(SSL *s, void *secret, int *secret_len,
                           UNUSED STACK_OF(SSL_CIPHER) *peer_ciphers,
                           UNUSED SSL_CIPHER **cipher, void *arg)
+#else
+static int _session_secret(SSL *s, void *secret, int *secret_len,
+                          UNUSED STACK_OF(SSL_CIPHER) *peer_ciphers,
+                          UNUSED const SSL_CIPHER **cipher, void *arg)
+#endif
 {
        // FIXME enforce non-anon cipher