Skip to content

Commit

Permalink
security/strongswan: Fix crash in public key authentication with 5.6.2
Browse files Browse the repository at this point in the history
While here, added LICENSE_FILE.

PR:		226404
Submitted by:	strongswan@Nanoteq.com (maintainer)
Approved by:	tcberner (mentor, implicit)
  • Loading branch information
yurivict committed Mar 6, 2018
1 parent adca2f3 commit 32b1298
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
2 changes: 2 additions & 0 deletions security/strongswan/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= strongswan
PORTVERSION= 5.6.2
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://download.strongswan.org/ \
http://download2.strongswan.org/
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 32b1298

Please sign in to comment.