summaryrefslogtreecommitdiff
path: root/testing/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'testing/scripts')
-rw-r--r--testing/scripts/recipes/003_freeradius.mk3
-rw-r--r--testing/scripts/recipes/013_strongswan.mk3
-rw-r--r--testing/scripts/recipes/patches/freeradius-avp-size18
-rw-r--r--testing/scripts/recipes/patches/freeradius-tnc-fhh6
4 files changed, 7 insertions, 23 deletions
diff --git a/testing/scripts/recipes/003_freeradius.mk b/testing/scripts/recipes/003_freeradius.mk
index 7b7a5fe82..631c8b68a 100644
--- a/testing/scripts/recipes/003_freeradius.mk
+++ b/testing/scripts/recipes/003_freeradius.mk
@@ -1,6 +1,6 @@
#!/usr/bin/make
-PV = 2.2.0
+PV = 2.2.1
PKG = freeradius-server-$(PV)
TAR = $(PKG).tar.bz2
SRC = ftp://ftp.freeradius.org/pub/freeradius/$(TAR)
@@ -16,7 +16,6 @@ CONFIG_OPTS = \
PATCHES = \
freeradius-eap-sim-identity \
- freeradius-avp-size \
freeradius-tnc-fhh
all: install
diff --git a/testing/scripts/recipes/013_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk
index 6240d4228..85f80fe5b 100644
--- a/testing/scripts/recipes/013_strongswan.mk
+++ b/testing/scripts/recipes/013_strongswan.mk
@@ -43,6 +43,8 @@ CONFIG_OPTS = \
--enable-imv-os \
--enable-imc-attestation \
--enable-imv-attestation \
+ --enable-imc-swid \
+ --enable-imv-swid \
--enable-sql \
--enable-sqlite \
--enable-attr-sql \
@@ -73,6 +75,7 @@ CONFIG_OPTS = \
--enable-unity \
--enable-unbound \
--enable-ipseckey \
+ --enable-dnscert \
--enable-cmd \
--enable-libipsec \
--enable-kernel-libipsec \
diff --git a/testing/scripts/recipes/patches/freeradius-avp-size b/testing/scripts/recipes/patches/freeradius-avp-size
deleted file mode 100644
index e7e1f635b..000000000
--- a/testing/scripts/recipes/patches/freeradius-avp-size
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
-index 6c9bd13..3344c53 100644
---- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
-+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
-@@ -201,8 +201,11 @@ static VALUE_PAIR *diameter2vp(REQUEST *request, SSL *ssl,
- goto next_attr;
- }
-
-- if (size > 253) {
-- RDEBUG2("WARNING: diameter2vp skipping long attribute %u, attr");
-+ /*
-+ * EAP-Message AVPs can be larger than 253 octets.
-+ */
-+ if ((size > 253) && !((VENDOR(attr) == 0) && (attr == PW_EAP_MESSAGE))) {
-+ RDEBUG2("WARNING: diameter2vp skipping long attribute %u", attr);
- goto next_attr;
- }
-
diff --git a/testing/scripts/recipes/patches/freeradius-tnc-fhh b/testing/scripts/recipes/patches/freeradius-tnc-fhh
index 5abc6b25f..785538323 100644
--- a/testing/scripts/recipes/patches/freeradius-tnc-fhh
+++ b/testing/scripts/recipes/patches/freeradius-tnc-fhh
@@ -5074,7 +5074,7 @@ diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc
*
*/
-#include <freeradius-devel/ident.h>
--RCSID("$Id$")
+-RCSID("$Id: 213ede51c46a8c533961be8715395c0ab1f6b5c9 $")
-
-
-/*
@@ -5489,7 +5489,7 @@ diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc
*/
-#include <freeradius-devel/ident.h>
--RCSID("$Id$")
+-RCSID("$Id: 985ac01f384110b9a46ec8e84592351c21b3f09a $")
+/*
+ * EAP-TNC Packet with EAP Header, general structure
+ *
@@ -6180,7 +6180,7 @@ diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc
- *
- */
-#include <freeradius-devel/ident.h>
--RCSID("$Id$")
+-RCSID("$Id: 6077f6d2bdc2ebdea6575678e80e255f57215900 $")
-
-#include "tncs_connect.h"
-#include <ltdl.h>