From d4a8afc2e8693628f2de554e717458e08bcc2fcf Mon Sep 17 00:00:00 2001 From: Aric Belsito Date: Thu, 3 Nov 2016 11:37:23 -0700 Subject: [PATCH] Fix LibreSSL Build. From Voidlinux: From d51ab5615e11af4a2c160b2b8240e5d9f3c15422 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 13 Jul 2016 15:21:16 +0200 Subject: [PATCH] openconnect: update to 7.07. --- openssl-esp.c | 4 ++-- openssl.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openssl-esp.c b/openssl-esp.c index 2c1aa49..bd4dce3 100644 --- a/openssl-esp.c +++ b/openssl-esp.c @@ -27,7 +27,7 @@ #include #include -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #define EVP_CIPHER_CTX_free(c) do { \ EVP_CIPHER_CTX_cleanup(c); \ @@ -85,7 +85,7 @@ static int init_esp_ciphers(struct openconnect_info *vpninfo, struct esp *esp, } EVP_CIPHER_CTX_set_padding(esp->cipher, 0); -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) esp->hmac = malloc(sizeof(*esp->hmac)); esp->pkt_hmac = malloc(sizeof(*esp->pkt_hmac)); if (!esp->hmac || &esp->pkt_hmac) { diff --git a/openssl.c b/openssl.c index 785fd2a..6007cef 100644 --- a/openssl.c +++ b/openssl.c @@ -36,11 +36,11 @@ #include #include -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #define X509_up_ref(x) CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509) #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #define EVP_MD_CTX_new EVP_MD_CTX_create #define EVP_MD_CTX_free EVP_MD_CTX_destroy #define X509_STORE_CTX_get0_chain(ctx) ((ctx)->chain) @@ -991,7 +991,7 @@ static int set_peer_cert_hash(struct openconnect_info *vpninfo) return 0; } -#if OPENSSL_VERSION_NUMBER < 0x10002000L +#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) static int match_hostname_elem(const char *hostname, int helem_len, const char *match, int melem_len) { @@ -1653,7 +1653,7 @@ int openconnect_open_https(struct openconnect_info *vpninfo) * 4fcdd66fff5fea0cfa1055c6680a76a4303f28a2 * cd6bd5ffda616822b52104fee0c4c7d623fd4f53 */ -#if OPENSSL_VERSION_NUMBER >= 0x10001070 +#if OPENSSL_VERSION_NUMBER >= 0x10001070 || defined(LIBRESSL_VERSION_NUMBER) if (string_is_hostname(vpninfo->hostname)) SSL_set_tlsext_host_name(https_ssl, vpninfo->hostname); #endif -- 2.10.2