svn commit: r421931 - head/security/openconnect/files
John Marino
marino at FreeBSD.org
Mon Sep 12 15:38:43 UTC 2016
Author: marino
Date: Mon Sep 12 15:38:42 2016
New Revision: 421931
URL: https://svnweb.freebsd.org/changeset/ports/421931
Log:
security/openconnect; Fix build with LibreSSL
Approved by: SSL blanket
Added:
head/security/openconnect/files/
head/security/openconnect/files/patch-openssl-esp.c (contents, props changed)
head/security/openconnect/files/patch-openssl.c (contents, props changed)
Added: head/security/openconnect/files/patch-openssl-esp.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/openconnect/files/patch-openssl-esp.c Mon Sep 12 15:38:42 2016 (r421931)
@@ -0,0 +1,20 @@
+--- openssl-esp.c.orig 2016-07-08 15:35:18 UTC
++++ openssl-esp.c
+@@ -27,7 +27,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/rand.h>
+
+-#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 openc
+ }
+ 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) {
Added: head/security/openconnect/files/patch-openssl.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/openconnect/files/patch-openssl.c Mon Sep 12 15:38:42 2016 (r421931)
@@ -0,0 +1,25 @@
+--- openssl.c.orig 2016-07-09 14:43:41 UTC
++++ openssl.c
+@@ -36,11 +36,11 @@
+ #include <openssl/ui.h>
+ #include <openssl/rsa.h>
+
+-#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 ope
+ 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)
+ {
More information about the svn-ports-head
mailing list