From owner-svn-ports-all@freebsd.org Sun Mar 11 08:49:07 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90B25F3A9BA; Sun, 11 Mar 2018 08:49:07 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4506480C71; Sun, 11 Mar 2018 08:49:07 +0000 (UTC) (envelope-from yuri@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FFF71B07F; Sun, 11 Mar 2018 08:49:07 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2B8n7iO018206; Sun, 11 Mar 2018 08:49:07 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2B8n78F018204; Sun, 11 Mar 2018 08:49:07 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201803110849.w2B8n78F018204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 11 Mar 2018 08:49:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r464151 - in branches/2018Q1/security/strongswan: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in branches/2018Q1/security/strongswan: . files X-SVN-Commit-Revision: 464151 X-SVN-Commit-Repository: ports 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.25 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: Sun, 11 Mar 2018 08:49:07 -0000 Author: yuri Date: Sun Mar 11 08:49:06 2018 New Revision: 464151 URL: https://svnweb.freebsd.org/changeset/ports/464151 Log: MFH: r463768 security/strongswan: Fix crash in public key authentication with 5.6.2 While here, added LICENSE_FILE. PR: 226404 Submitted by: strongswan@Nanoteq.com (maintainer) Approved by: tcberner (mentor, implicit) Approved by: ports-secteam (lists@eitanadler.com) Added: branches/2018Q1/security/strongswan/files/patch-src_libcharon_sa_ikev2_authenticators_pubkey_authenticator.c - copied unchanged from r463768, head/security/strongswan/files/patch-src_libcharon_sa_ikev2_authenticators_pubkey_authenticator.c Modified: branches/2018Q1/security/strongswan/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/security/strongswan/Makefile ============================================================================== --- branches/2018Q1/security/strongswan/Makefile Sun Mar 11 08:46:12 2018 (r464150) +++ branches/2018Q1/security/strongswan/Makefile Sun Mar 11 08:49:06 2018 (r464151) @@ -3,6 +3,7 @@ PORTNAME= strongswan PORTVERSION= 5.6.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://download.strongswan.org/ \ http://download2.strongswan.org/ @@ -11,6 +12,7 @@ MAINTAINER= strongswan@nanoteq.com COMMENT= Open Source IKEv2 IPsec-based VPN solution LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe libtool:keepla pkgconfig tar:bzip2 ssl USE_RC_SUBR= strongswan Copied: branches/2018Q1/security/strongswan/files/patch-src_libcharon_sa_ikev2_authenticators_pubkey_authenticator.c (from r463768, head/security/strongswan/files/patch-src_libcharon_sa_ikev2_authenticators_pubkey_authenticator.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/security/strongswan/files/patch-src_libcharon_sa_ikev2_authenticators_pubkey_authenticator.c Sun Mar 11 08:49:06 2018 (r464151, copy of r463768, head/security/strongswan/files/patch-src_libcharon_sa_ikev2_authenticators_pubkey_authenticator.c) @@ -0,0 +1,22 @@ +--- src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c.orig ++++ src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c +@@ -164,7 +164,7 @@ static array_t *select_signature_schemes(keymat_v2_t *keymat, + signature_scheme_t schemes[] = { + SIGN_RSA_EMSA_PKCS1_SHA2_384, + SIGN_RSA_EMSA_PKCS1_SHA2_256, +- }, contained; ++ }; + bool found; + int i, j; + +@@ -174,8 +174,8 @@ static array_t *select_signature_schemes(keymat_v2_t *keymat, + found = FALSE; + for (j = 0; j < array_count(selected); j++) + { +- array_get(selected, j, &contained); +- if (scheme == contained) ++ array_get(selected, j, &config); ++ if (scheme == config->scheme) + { + found = TRUE; + break;