From owner-svn-ports-all@freebsd.org Sat May 20 14:29:11 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EFDD2D751D9; Sat, 20 May 2017 14:29:11 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A7C831CE5; Sat, 20 May 2017 14:29:11 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4KETAQ3053190; Sat, 20 May 2017 14:29:10 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4KETAAE053189; Sat, 20 May 2017 14:29:10 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201705201429.v4KETAAE053189@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 20 May 2017 14:29:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441315 - head/security/openconnect/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 May 2017 14:29:12 -0000 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 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 +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 +Signed-off-by: David Woodhouse +--- 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