DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix build with LibreSSL 2.7

Browse source 
LibreSSL 2.7 adds (most of) the OpenSSL 1.1 API.

Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
This commit is contained in:
Bernard Spil 2018-04-01 21:58:06 +02:00 • committed by Jouni Malinen
parent a2ab37308a
commit ba3658cfff
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/crypto/crypto_openssl.c
View file

@ -33,7 +33,9 @@
#include "aes_wrap.h" #include "aes_wrap.h"
#include "crypto.h" #include "crypto.h"
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10100000L || \
(defined(LIBRESSL_VERSION_NUMBER) && \
LIBRESSL_VERSION_NUMBER < 0x20700000L)
/* Compatibility wrappers for older versions. */ /* Compatibility wrappers for older versions. */
static HMAC_CTX * HMAC_CTX_new(void) static HMAC_CTX * HMAC_CTX_new(void)
@ -79,7 +81,9 @@ static void EVP_MD_CTX_free(EVP_MD_CTX *ctx)
static BIGNUM * get_group5_prime(void) static BIGNUM * get_group5_prime(void)
{ {
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
!(defined(LIBRESSL_VERSION_NUMBER) && \
LIBRESSL_VERSION_NUMBER < 0x20700000L)
return BN_get_rfc3526_prime_1536(NULL); return BN_get_rfc3526_prime_1536(NULL);
#elif !defined(OPENSSL_IS_BORINGSSL) #elif !defined(OPENSSL_IS_BORINGSSL)
return get_rfc3526_prime_1536(NULL); return get_rfc3526_prime_1536(NULL);
@ -681,7 +685,9 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx)
void * dh5_init(struct wpabuf **priv, struct wpabuf **publ) void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
{ {
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10100000L || \
(defined(LIBRESSL_VERSION_NUMBER) && \
LIBRESSL_VERSION_NUMBER < 0x20700000L)
DH *dh; DH *dh;
struct wpabuf *pubkey = NULL, *privkey = NULL; struct wpabuf *pubkey = NULL, *privkey = NULL;
size_t publen, privlen; size_t publen, privlen;
@ -782,7 +788,9 @@ err:
void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ) void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
{ {
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10100000L || \
(defined(LIBRESSL_VERSION_NUMBER) && \
LIBRESSL_VERSION_NUMBER < 0x20700000L)
DH *dh; DH *dh;
dh = DH_new(); dh = DH_new();

19
src/crypto/tls_openssl.c
View file

@ -59,7 +59,8 @@ typedef int stack_index_t;
#endif /* SSL_set_tlsext_status_type */ #endif /* SSL_set_tlsext_status_type */
#if (OPENSSL_VERSION_NUMBER < 0x10100000L || \ #if (OPENSSL_VERSION_NUMBER < 0x10100000L || \
defined(LIBRESSL_VERSION_NUMBER)) && \ (defined(LIBRESSL_VERSION_NUMBER) && \
LIBRESSL_VERSION_NUMBER < 0x20700000L)) && \
!defined(BORINGSSL_API_VERSION) !defined(BORINGSSL_API_VERSION)
/* /*
* SSL_get_client_random() and SSL_get_server_random() were added in OpenSSL * SSL_get_client_random() and SSL_get_server_random() were added in OpenSSL
@ -931,7 +932,9 @@ void * tls_init(const struct tls_config *conf)
} }
#endif /* OPENSSL_FIPS */ #endif /* OPENSSL_FIPS */
#endif /* CONFIG_FIPS */ #endif /* CONFIG_FIPS */
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10100000L || \
(defined(LIBRESSL_VERSION_NUMBER) && \
LIBRESSL_VERSION_NUMBER < 0x20700000L)
SSL_load_error_strings(); SSL_load_error_strings();
SSL_library_init(); SSL_library_init();
#ifndef OPENSSL_NO_SHA256 #ifndef OPENSSL_NO_SHA256
@ -1063,7 +1066,9 @@ void tls_deinit(void *ssl_ctx)
tls_openssl_ref_count--; tls_openssl_ref_count--;
if (tls_openssl_ref_count == 0) { if (tls_openssl_ref_count == 0) {
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10100000L || \
(defined(LIBRESSL_VERSION_NUMBER) && \
LIBRESSL_VERSION_NUMBER < 0x20700000L)
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
ENGINE_cleanup(); ENGINE_cleanup();
#endif /* OPENSSL_NO_ENGINE */ #endif /* OPENSSL_NO_ENGINE */
@ -3409,7 +3414,9 @@ int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn,
#ifdef OPENSSL_NEED_EAP_FAST_PRF #ifdef OPENSSL_NEED_EAP_FAST_PRF
static int openssl_get_keyblock_size(SSL *ssl) static int openssl_get_keyblock_size(SSL *ssl)
{ {
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10100000L || \
(defined(LIBRESSL_VERSION_NUMBER) && \
LIBRESSL_VERSION_NUMBER < 0x20700000L)
const EVP_CIPHER *c; const EVP_CIPHER *c;
const EVP_MD *h; const EVP_MD *h;
int md_size; int md_size;
@ -4535,7 +4542,9 @@ static int tls_sess_sec_cb(SSL *s, void *secret, int *secret_len,
struct tls_connection *conn = arg; struct tls_connection *conn = arg;
int ret; int ret;
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10100000L || \
(defined(LIBRESSL_VERSION_NUMBER) && \
LIBRESSL_VERSION_NUMBER < 0x20700000L)
if (conn == NULL || conn->session_ticket_cb == NULL) if (conn == NULL || conn->session_ticket_cb == NULL)
return 0; return 0;