Date: Sat, 20 May 2017 14:29:10 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441315 - head/security/openconnect/files Message-ID: <201705201429.v4KETAAE053189@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat May 20 14:29:10 2017 New Revision: 441315 URL: https://svnweb.freebsd.org/changeset/ports/441315 Log: security/openconnect: Fix DTLS with LibreSSL - Add patch from upstream PR: 219273 Submitted by: Piotr Kubaj <pkubaj@anongoth.pl> Added: head/security/openconnect/files/ - copied from r431722, head/security/openconnect/files/ head/security/openconnect/files/patch-openssl-dtls.c (contents, props changed) Deleted: head/security/openconnect/files/patch-openssl-esp.c head/security/openconnect/files/patch-openssl.c Added: head/security/openconnect/files/patch-openssl-dtls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openconnect/files/patch-openssl-dtls.c Sat May 20 14:29:10 2017 (r441315) @@ -0,0 +1,30 @@ +From 69793ae0c1b3b6cb2e4baecc224ea714707ac329 Mon Sep 17 00:00:00 2001 +From: Piotr Kubaj <pkubaj@anongoth.pl> +Date: Fri, 12 May 2017 14:24:37 +0100 +Subject: [PATCH 1/1] Fix build with LibreSSL 2.5.1 and higher. + +We don't actually care if we use the read or write state; we're only +calculating the cipher/protocol overheads which are the same in both +directions. + +In LibreSSL they were all removed in +https://github.com/libressl-portable/openbsd/commit/122ecd906da7 +and the read side was restored in +https://github.com/libressl-portable/openbsd/commit/0d7a7d5f5a44 +so just use that. + +Signed-off-by: Piotr Kubaj <pkubaj@anongoth.pl> +Signed-off-by: David Woodhouse <dwmw2@infradead.org> +--- openssl-dtls.c.orig 2016-12-06 13:03:51 UTC ++++ openssl-dtls.c +@@ -100,8 +100,8 @@ static int dtls_get_data_mtu(struct open + } + #else + /* OpenSSL <= 1.0.2 only supports CBC ciphers with PSK */ +- ivlen = EVP_CIPHER_iv_length(EVP_CIPHER_CTX_cipher(vpninfo->dtls_ssl->enc_write_ctx)); +- maclen = EVP_MD_CTX_size(vpninfo->dtls_ssl->write_hash); ++ ivlen = EVP_CIPHER_iv_length(EVP_CIPHER_CTX_cipher(vpninfo->dtls_ssl->enc_read_ctx)); ++ maclen = EVP_MD_CTX_size(vpninfo->dtls_ssl->read_hash); + blocksize = ivlen; + pad = 1; + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705201429.v4KETAAE053189>