Attachment #193862 for bug #228631

Lines 2-9 Link Here

(-)security/strongswan/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= strongswan	4	PORTNAME= strongswan
5	PORTVERSION= 5.6.2	5	PORTVERSION= 5.6.3
6	PORTREVISION= 1
7	CATEGORIES= security	6	CATEGORIES= security
8	MASTER_SITES= http://download.strongswan.org/ \	7	MASTER_SITES= http://download.strongswan.org/ \
9	http://download2.strongswan.org/	8	http://download2.strongswan.org/

Lines 1-3 Link Here

(-)security/strongswan/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1519043301	1	TIMESTAMP = 1527575366
2	SHA256 (strongswan-5.6.2.tar.bz2) = e0a60a30ebf3c534c223559e1686497a21ded709a5d605c5123c2f52bcc22e92	2	SHA256 (strongswan-5.6.3.tar.bz2) = c3c7dc8201f40625bba92ffd32eb602a8909210d8b3fac4d214c737ce079bf24
3	SIZE (strongswan-5.6.2.tar.bz2) = 4977859	3	SIZE (strongswan-5.6.3.tar.bz2) = 4961579




--- 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;

Return to bug 228631

Lines 1-22 Link Here

(-)security/strongswan/files/patch-src_libcharon_sa_ikev2_authenticators_pubkey_authenticator.c (-22 lines)
1	--- src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c.orig
2	+++ src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c
3	@@ -164,7 +164,7 @@ static array_t select_signature_schemes(keymat_v2_t keymat,
4	signature_scheme_t schemes[] = {
5	SIGN_RSA_EMSA_PKCS1_SHA2_384,
6	SIGN_RSA_EMSA_PKCS1_SHA2_256,
7	- }, contained;
8	+ };
9	bool found;
10	int i, j;
11
12	@@ -174,8 +174,8 @@ static array_t select_signature_schemes(keymat_v2_t keymat,
13	found = FALSE;
14	for (j = 0; j < array_count(selected); j++)
15	{
16	- array_get(selected, j, &contained);
17	- if (scheme == contained)
18	+ array_get(selected, j, &config);
19	+ if (scheme == config->scheme)
20	{
21	found = TRUE;
22	break;