From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 10 Dec 2017 12:39:42 +0000 (+0000)
Subject: Enable EAP-SIM and SIM/USIM simulators in eapol_test builds
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f8666c8fa67a44e621ca7ddc986439e2a4da286;p=thirdparty%2Ffreeradius-server.git

Enable EAP-SIM and SIM/USIM simulators in eapol_test builds
---

diff --git a/scripts/travis/eapol_test/config_freebsd b/scripts/travis/eapol_test/config_freebsd
index 6108e38b997..b341b5704d8 100644
--- a/scripts/travis/eapol_test/config_freebsd
+++ b/scripts/travis/eapol_test/config_freebsd
@@ -9,6 +9,7 @@
 # be modified from here. In most cases, these lines should use += in order not
 # to override previous values of the variables.
 
+CFLAGS += -g3
 #CFLAGS += -I/usr/local/include/openssl
 #LIBS += -L/usr/local/lib
 
@@ -134,7 +135,10 @@ CONFIG_EAP_AKA=y
 CONFIG_EAP_AKA_PRIME=y
 
 # Enable USIM simulator (Milenage) for EAP-AKA
-#CONFIG_USIM_SIMULATOR=y
+CONFIG_USIM_SIMULATOR=y
+
+# Enable SIM simulator (Milenage) for EAP-SIM
+CONFIG_SIM_SIMULATOR=y
 
 # EAP-SAKE
 CONFIG_EAP_SAKE=y
diff --git a/scripts/travis/eapol_test/config_linux b/scripts/travis/eapol_test/config_linux
index 8268a3e7046..7ea10884496 100644
--- a/scripts/travis/eapol_test/config_linux
+++ b/scripts/travis/eapol_test/config_linux
@@ -9,7 +9,7 @@
 # be modified from here. In most cases, these lines should use += in order not
 # to override previous values of the variables.
 
-
+CFLAGS += -g3
 #CFLAGS += -I/usr/local/include/openssl
 #LIBS += -L/usr/local/lib
 
@@ -113,7 +113,7 @@ CONFIG_EAP_GTC=y
 CONFIG_EAP_OTP=y
 
 # EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
+CONFIG_EAP_SIM=y
 
 # EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
 CONFIG_EAP_PSK=y
@@ -135,7 +135,10 @@ CONFIG_EAP_AKA=y
 CONFIG_EAP_AKA_PRIME=y
 
 # Enable USIM simulator (Milenage) for EAP-AKA
-#CONFIG_USIM_SIMULATOR=y
+CONFIG_USIM_SIMULATOR=y
+
+# Enable SIM simulator (Milenage) for EAP-SIM
+CONFIG_SIM_SIMULATOR=y
 
 # EAP-SAKE
 CONFIG_EAP_SAKE=y
diff --git a/scripts/travis/eapol_test/config_osx b/scripts/travis/eapol_test/config_osx
index 0da145086ee..e30f1e01d71 100644
--- a/scripts/travis/eapol_test/config_osx
+++ b/scripts/travis/eapol_test/config_osx
@@ -9,7 +9,7 @@
 # be modified from here. In most cases, these lines should use += in order not
 # to override previous values of the variables.
 
-CFLAGS += -I /usr/local/opt/openssl/include -I/usr/local/include/openssl
+CFLAGS += -g3 -I /usr/local/opt/openssl/include -I/usr/local/include/openssl
 LIBS += -L/usr/local/opt/openssl/lib -L/usr/local/lib
 
 # Some Red Hat versions seem to include kerberos header files from OpenSSL, but
@@ -112,7 +112,7 @@ CONFIG_EAP_GTC=y
 CONFIG_EAP_OTP=y
 
 # EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
+CONFIG_EAP_SIM=y
 
 # EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
 CONFIG_EAP_PSK=y
@@ -134,7 +134,10 @@ CONFIG_EAP_AKA=y
 CONFIG_EAP_AKA_PRIME=y
 
 # Enable USIM simulator (Milenage) for EAP-AKA
-#CONFIG_USIM_SIMULATOR=y
+CONFIG_USIM_SIMULATOR=y
+
+# Enable SIM simulator (Milenage) for EAP-SIM
+CONFIG_SIM_SIMULATOR=y
 
 # EAP-SAKE
 CONFIG_EAP_SAKE=y