denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Remove TNC@FHH dependencies and scenarios that rely on them

Browse Source 
While we could continue to use FreeRADIUS 2.x that branch is officially EOL.
So instead of investing time and effort in updating/migrating the patches to
FreeRADIUS 3.x (the module changed quite significantly as it relies solely on
the naeap library in that release), for a protocol that is superseded anyway,
we just remove these scenarios and the dependencies.  Actually, the
complete rlm_eap_tnc module will be removed with FreeRADIUS 4.0.
This commit is contained in:
Tobias Brunner
2018-11-21 14:32:24 +01:00
parent babb979e42
commit 2fbe44bef3
154 changed files with 2 additions and 11629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/scripts/build-baseimage
+1 -1
View File
@@ -34,7 +34,7 @@ stretch)
*)
echo_warn "Package list for '$BASEIMGSUITE' might has to be updated"
esac
SERVICES="apache2 dbus isc-dhcp-server slapd bind9"
SERVICES="apache2 dbus isc-dhcp-server slapd bind9 freeradius"
INC=$INC,${SERVICES// /,}
CACHEDIR=$BUILDDIR/cache
testing/scripts/recipes/001_libtnc.mk
-31
View File
@@ -1,31 +0,0 @@
#!/usr/bin/make
PV = 1.25
PKG = libtnc-$(PV)
TAR = $(PKG).tar.gz
SRC = http://downloads.sourceforge.net/project/libtnc/libtnc/$(PV)/$(TAR)
NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
CONFIG_OPTS = \
--sysconfdir=/etc
all: install
$(TAR):
wget $(SRC)
.$(PKG)-unpacked: $(TAR)
tar xfz $(TAR)
@touch $@
.$(PKG)-configured: .$(PKG)-unpacked
cd $(PKG) && ./configure $(CONFIG_OPTS)
@touch $@
.$(PKG)-built: .$(PKG)-configured
cd $(PKG) && make -j $(NUM_CPUS)
@touch $@
install: .$(PKG)-built
cd $(PKG) && make install
testing/scripts/recipes/002_tnc-fhh.mk
-35
View File
@@ -1,35 +0,0 @@
#!/usr/bin/make
PKG = fhhtnc
SRC = git://github.com/trustatfhh/tnc-fhh.git
NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
CONFIG_OPTS = \
-DCOMPONENT=all \
-DNAL=8021x
PATCHES = \
tnc-fhh-tncsim
all: install
.$(PKG)-cloned:
git clone $(SRC) $(PKG)
mkdir $(PKG)/build
@touch $@
.$(PKG)-patches-applied: .$(PKG)-cloned
cd $(PKG) && cat $(addprefix ../patches/, $(PATCHES)) | patch -p1
@touch $@
.$(PKG)-configured: .$(PKG)-patches-applied
cd $(PKG)/build && cmake $(CONFIG_OPTS) ../
@touch $@
.$(PKG)-built: .$(PKG)-configured
cd $(PKG)/build && make -j $(NUM_CPUS)
@touch $@
install: .$(PKG)-built
cd $(PKG)/build && make install
testing/scripts/recipes/003_freeradius.mk
-43
View File
@@ -1,43 +0,0 @@
#!/usr/bin/make
PV = 2.2.8
PKG = freeradius-server-$(PV)
TAR = $(PKG).tar.bz2
SRC = ftp://ftp.freeradius.org/pub/freeradius/old/$(TAR)
NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
CONFIG_OPTS = \
--with-raddbdir=/etc/freeradius \
--sysconfdir=/etc \
--with-logdir=/var/log/freeradius \
--enable-developer \
--with-experimental-modules
PATCHES = \
freeradius-eap-sim-identity \
freeradius-tnc-fhh
all: install
$(TAR):
wget $(SRC)
.$(PKG)-unpacked: $(TAR)
tar xfj $(TAR)
@touch $@
.$(PKG)-patches-applied: .$(PKG)-unpacked
cd $(PKG) && cat $(addprefix ../patches/, $(PATCHES)) | patch -p1
@touch $@
.$(PKG)-configured: .$(PKG)-patches-applied
cd $(PKG) && ./configure $(CONFIG_OPTS)
@touch $@
.$(PKG)-built: .$(PKG)-configured
cd $(PKG) && make -j $(NUM_CPUS)
@touch $@
install: .$(PKG)-built
cd $(PKG) && make install
testing/scripts/recipes/004_hostapd.mk
-39
View File
@@ -1,39 +0,0 @@
#!/usr/bin/make
PV = 2.0
PKG = hostapd-$(PV)
TAR = $(PKG).tar.gz
SRC = http://w1.fi/releases/$(TAR)
NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
CONFIG_OPTS =
PATCHES = \
hostapd-config
SUBDIR = hostapd
all: install
$(TAR):
wget $(SRC)
.$(PKG)-unpacked: $(TAR)
tar xfz $(TAR)
@touch $@
.$(PKG)-patches-applied: .$(PKG)-unpacked
cd $(PKG) && cat $(addprefix ../patches/, $(PATCHES)) | patch -p1
@touch $@
.$(PKG)-configured: .$(PKG)-patches-applied
cp $(PKG)/$(SUBDIR)/defconfig $(PKG)/$(SUBDIR)/.config
@touch $@
.$(PKG)-built: .$(PKG)-configured
cd $(PKG)/$(SUBDIR) && make -j $(NUM_CPUS)
@touch $@
install: .$(PKG)-built
cd $(PKG)/$(SUBDIR) && make install
testing/scripts/recipes/004_wpa_supplicant.mk
-39
View File
@@ -1,39 +0,0 @@
#!/usr/bin/make
PV = 2.0
PKG = wpa_supplicant-$(PV)
TAR = $(PKG).tar.gz
SRC = http://w1.fi/releases/$(TAR)
NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
CONFIG_OPTS =
PATCHES = \
wpa_supplicant-eap-tnc
SUBDIR = wpa_supplicant
all: install
$(TAR):
wget $(SRC)
.$(PKG)-unpacked: $(TAR)
tar xfz $(TAR)
@touch $@
.$(PKG)-patches-applied: .$(PKG)-unpacked
cd $(PKG) && cat $(addprefix ../patches/, $(PATCHES)) | patch -p1
@touch $@
.$(PKG)-configured: .$(PKG)-patches-applied
cp $(PKG)/$(SUBDIR)/defconfig $(PKG)/$(SUBDIR)/.config
@touch $@
.$(PKG)-built: .$(PKG)-configured
cd $(PKG)/$(SUBDIR) && make -j $(NUM_CPUS)
@touch $@
install: .$(PKG)-built
cd $(PKG)/$(SUBDIR) && make install
testing/scripts/recipes/patches/freeradius-eap-sim-identity
-30
View File
@@ -1,30 +0,0 @@
--- a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c 2012-11-28 11:03:05.081225276 +0100
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c 2012-11-28 11:46:59.746289881 +0100
@@ -246,14 +246,21 @@
newvp->vp_integer = ess->sim_id++;
pairreplace(outvps, newvp);
+ ess->keys.identitylen = strlen(handler->identity);
+ memcpy(ess->keys.identity, handler->identity, ess->keys.identitylen);
+
/* make a copy of the identity */
newvp = pairfind(*invps, ATTRIBUTE_EAP_SIM_BASE + PW_EAP_SIM_IDENTITY);
- if (newvp) {
- ess->keys.identitylen = newvp->length;
- memcpy(ess->keys.identity, newvp->vp_octets, newvp->length);
- } else {
- ess->keys.identitylen = strlen(handler->identity);
- memcpy(ess->keys.identity, handler->identity, ess->keys.identitylen);
+ if (newvp && newvp->length > 2) {
+ uint16_t len;
+
+ memcpy(&len, newvp->vp_octets, sizeof(uint16_t));
+ len = ntohs(len);
+ if (len <= newvp->length - 2 && len <= MAX_STRING_LEN) {
+ ess->keys.identitylen = len;
+ memcpy(ess->keys.identity, newvp->vp_octets + 2,
+ ess->keys.identitylen);
+ }
}
/* all set, calculate keys! */
testing/scripts/recipes/patches/freeradius-tnc-fhh
-6687
View File
File diff suppressed because it is too large Load Diff
testing/scripts/recipes/patches/hostapd-config
-38
View File
@@ -1,38 +0,0 @@
diff -u -ur hostapd-2.0.orig/hostapd/defconfig hostapd-2.0/hostapd/defconfig
--- hostapd-2.0.orig/hostapd/defconfig 2013-01-12 16:42:53.000000000 +0100
+++ hostapd-2.0/hostapd/defconfig 2016-06-15 17:32:57.000000000 +0200
@@ -13,14 +13,14 @@
CONFIG_DRIVER_HOSTAP=y
# Driver interface for wired authenticator
-#CONFIG_DRIVER_WIRED=y
+CONFIG_DRIVER_WIRED=y
# Driver interface for madwifi driver
#CONFIG_DRIVER_MADWIFI=y
#CFLAGS += -I../../madwifi # change to the madwifi source directory
# Driver interface for drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
+#CONFIG_DRIVER_NL80211=y
# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
#CONFIG_DRIVER_BSD=y
@@ -30,7 +30,7 @@
#LIBS_c += -L/usr/local/lib
# Driver interface for no driver (e.g., RADIUS server only)
-#CONFIG_DRIVER_NONE=y
+CONFIG_DRIVER_NONE=y
# IEEE 802.11F/IAPP
CONFIG_IAPP=y
@@ -152,7 +152,7 @@
# Add support for writing debug log to a file: -f /tmp/hostapd.log
# Disabled by default.
-#CONFIG_DEBUG_FILE=y
+CONFIG_DEBUG_FILE=y
# Remove support for RADIUS accounting
#CONFIG_NO_ACCOUNTING=y
testing/scripts/recipes/patches/tnc-fhh-tncsim
-12
View File
@@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe65134512ea..3c5255f21ea6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,6 @@ IF(${COMPONENT} STREQUAL "ALL")
add_subdirectory(tncxacml)
add_subdirectory(imcv)
add_subdirectory(tncs)
- add_subdirectory(tncsim)
IF(${NAL} STREQUAL "8021X" OR ${NAL} STREQUAL "ALL")
add_subdirectory(naaeap)
testing/scripts/recipes/patches/wpa_supplicant-eap-tnc
-47
View File
@@ -1,47 +0,0 @@
diff -urN wpa_supplicant-2.0.ori/src/eap_peer/tncc.c wpa_supplicant-2.0/src/eap_peer/tncc.c
--- wpa_supplicant-2.0.ori/src/eap_peer/tncc.c 2013-01-12 16:42:53.000000000 +0100
+++ wpa_supplicant-2.0/src/eap_peer/tncc.c 2013-03-23 13:10:22.151059154 +0100
@@ -465,7 +465,7 @@
return -1;
}
#else /* CONFIG_NATIVE_WINDOWS */
- imc->dlhandle = dlopen(imc->path, RTLD_LAZY);
+ imc->dlhandle = dlopen(imc->path, RTLD_LAZY | RTLD_GLOBAL);
if (imc->dlhandle == NULL) {
wpa_printf(MSG_ERROR, "TNC: Failed to open IMC '%s' (%s): %s",
imc->name, imc->path, dlerror());
diff -urN wpa_supplicant-2.0.ori/wpa_supplicant/defconfig wpa_supplicant-2.0/wpa_supplicant/defconfig
--- wpa_supplicant-2.0.ori/wpa_supplicant/defconfig 2013-01-12 16:42:53.000000000 +0100
+++ wpa_supplicant-2.0/wpa_supplicant/defconfig 2013-03-23 13:06:08.759052370 +0100
@@ -86,7 +86,7 @@
CONFIG_DRIVER_WEXT=y
# Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
+#CONFIG_DRIVER_NL80211=y
# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
#CONFIG_DRIVER_BSD=y
@@ -193,7 +193,7 @@
#CONFIG_EAP_GPSK_SHA256=y
# EAP-TNC and related Trusted Network Connect support (experimental)
-#CONFIG_EAP_TNC=y
+CONFIG_EAP_TNC=y
# Wi-Fi Protected Setup (WPS)
#CONFIG_WPS=y
diff -urN wpa_supplicant-2.0.ori/wpa_supplicant/Makefile wpa_supplicant-2.0/wpa_supplicant/Makefile
--- wpa_supplicant-2.0.ori/wpa_supplicant/Makefile 2013-01-12 16:42:53.000000000 +0100
+++ wpa_supplicant-2.0/wpa_supplicant/Makefile 2013-03-23 13:06:08.759052370 +0100
@@ -6,8 +6,8 @@
CFLAGS = -MMD -O2 -Wall -g
endif
-export LIBDIR ?= /usr/local/lib/
-export BINDIR ?= /usr/local/sbin/
+export LIBDIR ?= /usr/lib/
+export BINDIR ?= /usr/sbin/
PKG_CONFIG ?= pkg-config
CFLAGS += -I../src