Date: Sun, 11 Mar 2018 08:49:07 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> 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 Message-ID: <201803110849.w2B8n78F018204@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803110849.w2B8n78F018204>