Merge branch 'testing-bullseye'

Use Debian bullseye as base image for the testing environment.
2021-10-01 17:13:18 +02:00
parent f92ad8454b 3edf3856d4
commit 5c24b05f0c
114 changed files with 61 additions and 1725 deletions
@@ -610,6 +610,12 @@ INSERT INTO products (      /* 102 */
 'Debian 10 x86_64'
 );

+INSERT INTO products (      /* 103 */
+  name
+) VALUES (
+ 'Debian 11 x86_64'
+);
+
 /* Directories */

 INSERT INTO directories (		/*  1 */
@@ -1336,6 +1342,12 @@ INSERT INTO groups_product_defaults (
  5, 102
 );

+INSERT INTO groups_product_defaults (
+  group_id, product_id
+) VALUES (
+  5, 103
+);
+
 INSERT INTO groups_product_defaults (
  group_id, product_id
 ) VALUES (
@@ -693,19 +693,9 @@ do
 	do
 	    eval HOSTLOGIN=root@\$ipv4_${host}

-		RADIUS_DIR=/etc/freeradius/3.0
-		RADIUS_EAP_FILE=mods-enabled/eap
-		RADIUS_EAP_NAME=eap
-		if [ "$BASEIMGSUITE" == "jessie" ]
-		then
-			RADIUS_DIR=/etc/freeradius
-			RADIUS_EAP_FILE=eap.conf
-			RADIUS_EAP_NAME=eap.conf
-		fi
-
-		for file in clients.conf radiusd.conf proxy.conf users sites-enabled/default sites-enabled/inner-tunnel $RADIUS_EAP_FILE
+		for file in clients.conf radiusd.conf proxy.conf users sites-enabled/default sites-enabled/inner-tunnel mods-enabled/eap
 	    do
-		scp $SSHCONF $HOSTLOGIN:$RADIUS_DIR/$file \
+		scp $SSHCONF $HOSTLOGIN:/etc/freeradius/3.0/$file \
 		    $TESTRESULTDIR/${host}.$(basename $file) > /dev/null 2>&1
 	    done

@@ -721,7 +711,7 @@ do
 	  <ul>
 	    <li><a href="$host.clients.conf">clients.conf</a></li>
 	    <li><a href="$host.radiusd.conf">radiusd.conf</a></li>
-	    <li><a href="$host.$RADIUS_EAP_NAME">$RADIUS_EAP_NAME</a></li>
+	    <li><a href="$host.eap">eap</a></li>
 	  </ul>
 	</td>
 	<td valign="top">
@@ -1,4 +0,0 @@
-client 10.1.0.1 {
-  secret    = gv6URkSs
-  shortname = moon
-}
@@ -1,32 +0,0 @@
-#
-#	This is the master dictionary file, which references the
-#	pre-defined dictionary files included with the server.
-#
-#	Any new/changed attributes MUST be placed in this file, as
-#	the pre-defined dictionaries SHOULD NOT be edited.
-#
-#	$Id$
-#
-
-#
-#	The filename given here should be an absolute path.
-#
-$INCLUDE	/usr/share/freeradius/dictionary
-
-#
-#	Place additional attributes or $INCLUDEs here.  They will
-#	over-ride the definitions in the pre-defined dictionaries.
-#
-#	See the 'man' page for 'dictionary' for information on
-#	the format of the dictionary files.
-
-#
-#	If you want to add entries to the dictionary file,
-#	which are NOT going to be placed in a RADIUS packet,
-#	add them here.  The numbers you pick should be between
-#	3000 and 4000.
-#
-
-#ATTRIBUTE	My-Local-String		3000	string
-#ATTRIBUTE	My-Local-IPAddr		3001	ipaddr
-#ATTRIBUTE	My-Local-Integer	3002	integer
@@ -1,118 +0,0 @@
-# radiusd.conf	-- FreeRADIUS server configuration file.
-
-prefix = /usr
-exec_prefix = ${prefix}
-sysconfdir = /etc
-localstatedir = /var
-sbindir = ${exec_prefix}/sbin
-logdir = ${localstatedir}/log/freeradius
-raddbdir = ${sysconfdir}/freeradius
-radacctdir = ${logdir}/radacct
-
-#  name of the running server.  See also the "-n" command-line option.
-name = freeradius
-
-#  Location of config and logfiles.
-confdir = ${raddbdir}
-run_dir = ${localstatedir}/run
-
-# Should likely be ${localstatedir}/lib/radiusd
-db_dir = ${raddbdir}
-
-# libdir: Where to find the rlm_* modules.
-libdir = ${exec_prefix}/lib
-
-#  pidfile: Where to place the PID of the RADIUS server.
-pidfile = ${run_dir}/${name}.pid
-
-#  max_request_time: The maximum time (in seconds) to handle a request.
-max_request_time = 30
-
-#  cleanup_delay: The time to wait (in seconds) before cleaning up
-cleanup_delay = 5
-
-#  max_requests: The maximum number of requests which the server keeps
-max_requests = 1024
-
-#  listen: Make the server listen on a particular IP address, and send
-listen {
-  type = auth
-  ipaddr = 10.1.0.10
-  port = 0
-}
-
-#  This second "listen" section is for listening on the accounting
-#  port, too.
-#
-listen {
-  type  = acct
-  ipaddr = 10.1.0.10
-  port = 0
-}
-
-#  hostname_lookups: Log the names of clients or just their IP addresses
-hostname_lookups = no
-
-#  Core dumps are a bad thing.  This should only be set to 'yes'
-allow_core_dumps = no
-
-#  Regular expressions
-regular_expressions = yes
-extended_expressions = yes
-
-#  Logging section.  The various "log_*" configuration items
-log {
-  destination = files
-  file = ${logdir}/radius.log
-  syslog_facility = daemon
-  stripped_names = no
-  auth = yes
-  auth_badpass = yes
-  auth_goodpass = yes
-}
-
-#  The program to execute to do concurrency checks.
-checkrad = ${sbindir}/checkrad
-
-#  Security considerations
-security {
-  max_attributes = 200
-  reject_delay = 1
-  status_server = yes
-}
-
-# PROXY CONFIGURATION
-proxy_requests = yes
-$INCLUDE proxy.conf
-
-# CLIENTS CONFIGURATION
-$INCLUDE clients.conf
-
-# THREAD POOL CONFIGURATION
-thread pool {
-  start_servers = 5
-  max_servers = 32
-  min_spare_servers = 3
-  max_spare_servers = 10
-  max_requests_per_server = 0
-}
-
-# MODULE CONFIGURATION
-modules {
-  $INCLUDE ${confdir}/modules/
-  $INCLUDE eap.conf
-}
-
-# Instantiation
-instantiate {
-  exec
-  expr
-  expiration
-  logintime
-}
-
-# Policies
-$INCLUDE policy.conf
-
-# Include all enabled virtual hosts
-$INCLUDE sites-enabled/
@@ -1,6 +1,6 @@
 #! /bin/sh

 cat /usr/local/share/strongswan/templates/database/sw-collector/sw_collector_tables.sql | sqlite3 /etc/db.d/collector.db
-sed -i "s/DEBIAN_VERSION/10/" /etc/pts/collector.sql
+sed -i "s:DEBIAN_VERSION:`. /etc/os-release; echo $VERSION_ID`:" /etc/pts/collector.sql
 cat /etc/pts/collector.sql | sqlite3 /etc/db.d/collector.db
 LEAK_DETECTIVE_DISABLE=1 /usr/local/sbin/sw-collector
@@ -20,13 +20,17 @@ INC=$INC,libboost-thread-dev,libboost-system-dev,git,iperf,htop,valgrind,strace
 INC=$INC,gnat,gprbuild,acpid,acpi-support-base,libldns-dev,libunbound-dev
 INC=$INC,dnsutils,libsoup2.4-dev,ca-certificates,unzip,libsystemd-dev
 INC=$INC,python3,python3-setuptools,python3-dev,python3-pip,apt-transport-https
-INC=$INC,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3,iptables-dev
-INC=$INC,libxerces-c-dev,libgcrypt20-dev,traceroute
+INC=$INC,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3
+INC=$INC,libxerces-c-dev,libgcrypt20-dev,traceroute,iptables
 case "$BASEIMGSUITE" in
-jessie)
-	INC=$INC,libahven4-dev,libxmlada5-dev,libgmpada5-dev
-	INC=$INC,libalog1-dev
+bullseye)
+	INC=$INC,libiptc-dev
 	;;
+*)
+	INC=$INC,iptables-dev
+	;;
+esac
+case "$BASEIMGSUITE" in
 stretch)
 	INC=$INC,libahven5-dev,libxmlada-schema6-dev,libgmpada6-dev
 	INC=$INC,libalog2-dev
@@ -35,6 +39,13 @@ buster)
 	INC=$INC,libahven7-dev,libxmlada-schema8-dev,libgmpada8-dev
 	INC=$INC,libalog4-dev,dbus-user-session
 	;;
+bullseye)
+	INC=$INC,libahven9-dev,libxmlada-schema10-dev,libgmpada10-dev
+	INC=$INC,libalog6-dev,dbus-user-session
+	# workaround for dependency issue gdb -> libsource-highlight4v5 -> virtual
+	# package (libboost-regex1.74.0-icu67), which debootstrap can't resolve (#878961)
+	INC=$INC,libboost-regex1.74.0
+	;;
 *)
 	echo_warn "Package list for '$BASEIMGSUITE' might has to be updated"
 	;;
@@ -136,7 +147,7 @@ do
 done

 case "$BASEIMGSUITE" in
-buster)
+buster|bullseye)
 	log_action "Switching from iptables-nft to iptables-legacy"
 	execute_chroot "update-alternatives --set iptables /usr/sbin/iptables-legacy" 0
 	execute_chroot "update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy" 0
@@ -75,7 +75,10 @@ do
 		execute_chroot "dnssec-signzone -K /etc/bind -o org. /etc/bind/db.org" 0
 		execute_chroot "dnssec-signzone -K /etc/bind -o . /etc/bind/db.root" 0

-		for service in "apache2 slapd bind9"
+		# on bullseye, enabling via bind9 doesn't work, while disabling does, so
+		# use named there. on the other hand, older releases don't have named
+		# service files (systemctl returns 0 even if files are not found)
+		for service in apache2 slapd bind9 named
 		do
 			execute_chroot "systemctl enable $service" 0
 		done
@@ -49,7 +49,7 @@ fi
 # Base image settings
 # The base image is a pristine OS installation created using debootstrap.
 : ${BASEIMGSIZE=2500}
-: ${BASEIMGSUITE=buster}
+: ${BASEIMGSUITE=bullseye}
 : ${BASEIMGARCH=amd64}
 : ${BASEIMG=$IMGDIR/debian-$BASEIMGSUITE-$BASEIMGARCH.$IMGEXT}
 : ${BASEIMGMIRROR=http://http.debian.net/debian}
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = md5
-  md5 {
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,43 +0,0 @@
-authorize {
-  suffix
-  eap {
-    ok = return
-  }
-  files
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1 +0,0 @@
-carol	Cleartext-Password := "4iChxLT3"
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = md5
-  md5 {
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,39 +0,0 @@
-authorize {
-  suffix
-  files
-}
-
-authenticate {
-  pap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-}
@@ -1 +0,0 @@
-carol	Cleartext-Password := "4iChxLT3"
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = md5
-  md5 {
-  }
-}
@@ -1,5 +0,0 @@
-realm LOCAL {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,42 +0,0 @@
-authorize {
-  eap {
-    ok = return
-  }
-  files
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = md5
-  md5 {
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,43 +0,0 @@
-authorize {
-  suffix
-  eap {
-    ok = return
-  }
-  files
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
@@ -1,18 +0,0 @@
-eap {
-  md5 {
-  }
-  default_eap_type = peap
-  tls {
-    private_key_file = /etc/raddb/certs/aaaKey.pem
-    certificate_file = /etc/raddb/certs/aaaCert.pem
-    CA_file = /etc/raddb/certs/strongswanCert.pem
-    cipher_list = "DEFAULT"
-    dh_file = /etc/raddb/certs/dh
-    random_file = /etc/raddb/certs/random
-  }
-  peap {
-    default_eap_type = md5
-    use_tunneled_reply = yes
-    virtual_server = "inner-tunnel"
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,43 +0,0 @@
-authorize {
-  suffix
-  eap {
-    ok = return
-  }
-  files
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1,32 +0,0 @@
-server inner-tunnel {
-
-authorize {
-	suffix
-	eap {
-		ok = return
-	}
-	files
-}
-
-authenticate {
-	eap
-}
-
-session {
-	radutmp
-}
-
-post-auth {
-	Post-Auth-Type REJECT {
-		attr_filter.access_reject
-	}
-}
-
-pre-proxy {
-}
-
-post-proxy {
-	eap
-}
-
-} # inner-tunnel server block
@@ -1,2 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
-dave	Cleartext-Password := "W7R0g3do"
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = sim
-  sim {
-  }
-}
@@ -1,5 +0,0 @@
-realm LOCAL {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,53 +0,0 @@
-authorize {
-  files
-  update reply {
-    EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}"
-    EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}"
-    EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}"
-    EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}"
-    EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}"
-    EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}"
-    EAP-Sim-KC1   := "%{control:EAP-Sim-KC1}"
-    EAP-Sim-KC2   := "%{control:EAP-Sim-KC2}"
-    EAP-Sim-KC3   := "%{control:EAP-Sim-KC3}"
-  }
-  eap {
-    ok = return
-  }
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1 +0,0 @@
-228060123456001	EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = sim
-  sim {
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,54 +0,0 @@
-authorize {
-  files
-  suffix
-  update reply {
-    EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}"
-    EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}"
-    EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}"
-    EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}"
-    EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}"
-    EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}"
-    EAP-Sim-KC1   := "%{control:EAP-Sim-KC1}"
-    EAP-Sim-KC2   := "%{control:EAP-Sim-KC2}"
-    EAP-Sim-KC3   := "%{control:EAP-Sim-KC3}"
-  }
-  eap {
-    ok = return
-  }
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1,2 +0,0 @@
-[email protected]	EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB
-[email protected]	EAP-Type := SIM, EAP-Sim-RAND1 := 0x33000000000000000000000000000000, EAP-Sim-SRES1 := 0x33112233, EAP-Sim-KC1 := 0x335566778899AABB, EAP-Sim-RAND2 := 0x34000000000000000000000000000000, EAP-Sim-SRES2 := 0x34112233, EAP-Sim-KC2 := 0x345566778899AABB, EAP-Sim-RAND3 := 0x35000000000000000000000000000000, EAP-Sim-SRES3 := 0x35112233, EAP-Sim-KC3 := 0x355566778899AABB
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = sim
-  sim {
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,72 +0,0 @@
-authorize {
-  preprocess
-  chap
-  mschap
-  files
-  suffix
-  update reply {
-    EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}"
-    EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}"
-    EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}"
-    EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}"
-    EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}"
-    EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}"
-    EAP-Sim-KC1   := "%{control:EAP-Sim-KC1}"
-    EAP-Sim-KC2   := "%{control:EAP-Sim-KC2}"
-    EAP-Sim-KC3   := "%{control:EAP-Sim-KC3}"
-  }
-  eap {
-    ok = return
-  }
-  unix
-  files
-  expiration
-  logintime
-  pap
-}
-
-authenticate {
-  Auth-Type PAP {
-    pap
-  }
-  Auth-Type CHAP {
-    chap
-  }
-  Auth-Type MS-CHAP {
-    mschap
-  }
-  unix
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1,2 +0,0 @@
-[email protected]	EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB
-[email protected]	EAP-Type := SIM, EAP-Sim-RAND1 := 0x33000000000000000000000000000000, EAP-Sim-SRES1 := 0x33112233, EAP-Sim-KC1 := 0x335566778899AABB, EAP-Sim-RAND2 := 0x34000000000000000000000000000000, EAP-Sim-SRES2 := 0x34112233, EAP-Sim-KC2 := 0x345566778899AABB, EAP-Sim-RAND3 := 0x35000000000000000000000000000000, EAP-Sim-SRES3 := 0x35112233, EAP-Sim-KC3 := 0x355566778899AABB
@@ -1,13 +0,0 @@
-eap {
-  default_eap_type = tls
-  tls {
-    certdir = /etc/raddb/certs
-    cadir = /etc/raddb/certs
-    private_key_file = /etc/raddb/certs/aaaKey.pem
-    certificate_file = /etc/raddb/certs/aaaCert.pem
-    CA_file = /etc/raddb/certs/strongswanCert.pem
-    cipher_list = "DEFAULT"
-    dh_file = /etc/raddb/certs/dh
-    random_file = /etc/raddb/certs/random
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,41 +0,0 @@
-authorize {
-  eap {
-    ok = return
-  }
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
@@ -1,18 +0,0 @@
-eap {
-  md5 {
-  }
-  default_eap_type = ttls
-  tls {
-    private_key_file = /etc/raddb/certs/aaaKey.pem
-    certificate_file = /etc/raddb/certs/aaaCert.pem
-    CA_file = /etc/raddb/certs/strongswanCert.pem
-    cipher_list = "DEFAULT"
-    dh_file = /etc/raddb/certs/dh
-    random_file = /etc/raddb/certs/random
-  }
-  ttls {
-    default_eap_type = md5
-    use_tunneled_reply = yes
-    virtual_server = "inner-tunnel"
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,43 +0,0 @@
-authorize {
-  suffix
-  eap {
-    ok = return
-  }
-  files
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1,32 +0,0 @@
-server inner-tunnel {
-
-authorize {
-	suffix
-	eap {
-		ok = return
-	}
-	files
-}
-
-authenticate {
-	eap
-}
-
-session {
-	radutmp
-}
-
-post-auth {
-	Post-Auth-Type REJECT {
-		attr_filter.access_reject
-	}
-}
-
-pre-proxy {
-}
-
-post-proxy {
-	eap
-}
-
-} # inner-tunnel server block
@@ -1,2 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
-dave	Cleartext-Password := "W7R0g3do"
@@ -9,5 +9,5 @@ venus::rm /var/lib/dhcp/dhcpd.leases*; touch /var/lib/dhcp/dhcpd.leases
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-alice::arp -d 10.1.0.50
-alice::arp -d 10.1.0.51
+alice::ip neigh del 10.1.0.50 dev eth0
+alice::ip neigh del 10.1.0.51 dev eth0
@@ -7,5 +7,5 @@ venus::service isc-dhcp-server stop 2> /dev/null
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-alice::arp -d 10.1.0.30
-alice::arp -d 10.1.0.40
+alice::ip neigh del 10.1.0.30 dev eth0
+alice::ip neigh del 10.1.0.40 dev eth0
@@ -7,5 +7,5 @@ venus::service isc-dhcp-server stop 2> /dev/null
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-alice::arp -d 10.1.0.30
-alice::arp -d 10.1.0.40
+alice::ip neigh del 10.1.0.30 dev eth0
+alice::ip neigh del 10.1.0.40 dev eth0
@@ -1,8 +1,8 @@
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
-alice::arp -d 10.1.0.30
-alice::arp -d 10.1.0.40
+alice::ip neigh del 10.1.0.30 dev eth0
+alice::ip neigh del 10.1.0.40 dev eth0
 moon::systemctl start strongswan
 carol::systemctl start strongswan
 dave::systemctl start strongswan
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = sim
-  sim {
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,72 +0,0 @@
-authorize {
-  preprocess
-  chap
-  mschap
-  files
-  suffix
-  update reply {
-    EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}"
-    EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}"
-    EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}"
-    EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}"
-    EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}"
-    EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}"
-    EAP-Sim-KC1   := "%{control:EAP-Sim-KC1}"
-    EAP-Sim-KC2   := "%{control:EAP-Sim-KC2}"
-    EAP-Sim-KC3   := "%{control:EAP-Sim-KC3}"
-  }
-  eap {
-    ok = return
-  }
-  unix
-  files
-  expiration
-  logintime
-  pap
-}
-
-authenticate {
-  Auth-Type PAP {
-    pap
-  }
-  Auth-Type CHAP {
-    chap
-  }
-  Auth-Type MS-CHAP {
-    mschap
-  }
-  unix
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1,2 +0,0 @@
-228060123456001	EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB
-228060123456002	EAP-Type := SIM, EAP-Sim-RAND1 := 0x33000000000000000000000000000000, EAP-Sim-SRES1 := 0x33112233, EAP-Sim-KC1 := 0x335566778899AABB, EAP-Sim-RAND2 := 0x34000000000000000000000000000000, EAP-Sim-SRES2 := 0x34112233, EAP-Sim-KC2 := 0x345566778899AABB, EAP-Sim-RAND3 := 0x35000000000000000000000000000000, EAP-Sim-SRES3 := 0x35112233, EAP-Sim-KC3 := 0x355566778899AABB
@@ -25,4 +25,8 @@
 -A INPUT  -i eth0 -p udp --sport 53 -s PH_IP_WINNETOU -j ACCEPT
 -A OUTPUT -o eth0 -p udp --dport 53 -d PH_IP_WINNETOU -j ACCEPT

+# allow DNSSEC fetch from winnetou via TCP
+-A INPUT  -i eth0 -p tcp --sport 53 -s PH_IP_WINNETOU -j ACCEPT
+-A OUTPUT -o eth0 -p tcp --dport 53 -d PH_IP_WINNETOU -j ACCEPT
+
 COMMIT
@@ -25,4 +25,8 @@
 -A INPUT  -i eth0 -p udp --sport 53 -s PH_IP_WINNETOU -j ACCEPT
 -A OUTPUT -o eth0 -p udp --dport 53 -d PH_IP_WINNETOU -j ACCEPT

+# allow DNSSEC fetch from winnetou via TCP
+-A INPUT  -i eth0 -p tcp --sport 53 -s PH_IP_WINNETOU -j ACCEPT
+-A OUTPUT -o eth0 -p tcp --dport 53 -d PH_IP_WINNETOU -j ACCEPT
+
 COMMIT
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = md5
-  md5 {
-  }
-}
@@ -1,5 +0,0 @@
-realm LOCAL {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,42 +0,0 @@
-authorize {
-  eap {
-    ok = return
-  }
-  files
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1,4 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
-		Framed-IP-Address = 10.3.0.1
-dave	Cleartext-Password := "W7R0g3do"
-		Framed-IP-Address = 10.3.0.2
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = md5
-  md5 {
-  }
-}
@@ -1,5 +0,0 @@
-realm LOCAL {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,42 +0,0 @@
-authorize {
-  eap {
-    ok = return
-  }
-  files
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1,4 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
-		Class = "Research"
-dave	Cleartext-Password := "W7R0g3do"
-		Class = "Accounting"
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = md5
-  md5 {
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,43 +0,0 @@
-authorize {
-  suffix
-  eap {
-    ok = return
-  }
-  files
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = md5
-  md5 {
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,43 +0,0 @@
-authorize {
-  suffix
-  eap {
-    ok = return
-  }
-  files
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
@@ -1,18 +0,0 @@
-eap {
-  md5 {
-  }
-  default_eap_type = peap
-  tls {
-    private_key_file = /etc/raddb/certs/aaaKey.pem
-    certificate_file = /etc/raddb/certs/aaaCert.pem
-    CA_file = /etc/raddb/certs/strongswanCert.pem
-    cipher_list = "DEFAULT"
-    dh_file = /etc/raddb/certs/dh
-    random_file = /etc/raddb/certs/random
-  }
-  peap {
-    default_eap_type = md5
-    use_tunneled_reply = yes
-    virtual_server = "inner-tunnel"
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,43 +0,0 @@
-authorize {
-  suffix
-  eap {
-    ok = return
-  }
-  files
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1,32 +0,0 @@
-server inner-tunnel {
-
-authorize {
-	suffix
-	eap {
-		ok = return
-	}
-	files
-}
-
-authenticate {
-	eap
-}
-
-session {
-	radutmp
-}
-
-post-auth {
-	Post-Auth-Type REJECT {
-		attr_filter.access_reject
-	}
-}
-
-pre-proxy {
-}
-
-post-proxy {
-	eap
-}
-
-} # inner-tunnel server block
@@ -1,2 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
-dave	Cleartext-Password := "W7R0g3do"
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = sim
-  sim {
-  }
-}
@@ -1,5 +0,0 @@
-realm LOCAL {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,53 +0,0 @@
-authorize {
-  files
-  update reply {
-    EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}"
-    EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}"
-    EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}"
-    EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}"
-    EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}"
-    EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}"
-    EAP-Sim-KC1   := "%{control:EAP-Sim-KC1}"
-    EAP-Sim-KC2   := "%{control:EAP-Sim-KC2}"
-    EAP-Sim-KC3   := "%{control:EAP-Sim-KC3}"
-  }
-  eap {
-    ok = return
-  }
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1 +0,0 @@
-228060123456001	EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = sim
-  sim {
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,72 +0,0 @@
-authorize {
-  preprocess
-  chap
-  mschap
-  files
-  suffix
-  update reply {
-    EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}"
-    EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}"
-    EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}"
-    EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}"
-    EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}"
-    EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}"
-    EAP-Sim-KC1   := "%{control:EAP-Sim-KC1}"
-    EAP-Sim-KC2   := "%{control:EAP-Sim-KC2}"
-    EAP-Sim-KC3   := "%{control:EAP-Sim-KC3}"
-  }
-  eap {
-    ok = return
-  }
-  unix
-  files
-  expiration
-  logintime
-  pap
-}
-
-authenticate {
-  Auth-Type PAP {
-    pap
-  }
-  Auth-Type CHAP {
-    chap
-  }
-  Auth-Type MS-CHAP {
-    mschap
-  }
-  unix
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1,2 +0,0 @@
-[email protected]	EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB
-[email protected]	EAP-Type := SIM, EAP-Sim-RAND1 := 0x33000000000000000000000000000000, EAP-Sim-SRES1 := 0x33112233, EAP-Sim-KC1 := 0x335566778899AABB, EAP-Sim-RAND2 := 0x34000000000000000000000000000000, EAP-Sim-SRES2 := 0x34112233, EAP-Sim-KC2 := 0x345566778899AABB, EAP-Sim-RAND3 := 0x35000000000000000000000000000000, EAP-Sim-SRES3 := 0x35112233, EAP-Sim-KC3 := 0x355566778899AABB
@@ -1,5 +0,0 @@
-eap {
-  default_eap_type = sim
-  sim {
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,72 +0,0 @@
-authorize {
-  preprocess
-  chap
-  mschap
-  files
-  suffix
-  update reply {
-    EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}"
-    EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}"
-    EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}"
-    EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}"
-    EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}"
-    EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}"
-    EAP-Sim-KC1   := "%{control:EAP-Sim-KC1}"
-    EAP-Sim-KC2   := "%{control:EAP-Sim-KC2}"
-    EAP-Sim-KC3   := "%{control:EAP-Sim-KC3}"
-  }
-  eap {
-    ok = return
-  }
-  unix
-  files
-  expiration
-  logintime
-  pap
-}
-
-authenticate {
-  Auth-Type PAP {
-    pap
-  }
-  Auth-Type CHAP {
-    chap
-  }
-  Auth-Type MS-CHAP {
-    mschap
-  }
-  unix
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1,2 +0,0 @@
-[email protected]	EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB
-[email protected]	EAP-Type := SIM, EAP-Sim-RAND1 := 0x33000000000000000000000000000000, EAP-Sim-SRES1 := 0x33112233, EAP-Sim-KC1 := 0x335566778899AABB, EAP-Sim-RAND2 := 0x34000000000000000000000000000000, EAP-Sim-SRES2 := 0x34112233, EAP-Sim-KC2 := 0x345566778899AABB, EAP-Sim-RAND3 := 0x35000000000000000000000000000000, EAP-Sim-SRES3 := 0x35112233, EAP-Sim-KC3 := 0x355566778899AABB
@@ -1,13 +0,0 @@
-eap {
-  default_eap_type = tls
-  tls {
-    certdir = /etc/raddb/certs
-    cadir = /etc/raddb/certs
-    private_key_file = /etc/raddb/certs/aaaKey.pem
-    certificate_file = /etc/raddb/certs/aaaCert.pem
-    CA_file = /etc/raddb/certs/strongswanCert.pem
-    cipher_list = "DEFAULT"
-    dh_file = /etc/raddb/certs/dh
-    random_file = /etc/raddb/certs/random
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
@@ -1,41 +0,0 @@
-authorize {
-  eap {
-    ok = return
-  }
-}
-
-authenticate {
-  eap
-}
-
-preacct {
-  preprocess
-  acct_unique
-  suffix
-  files
-}
-
-accounting {
-  detail
-  unix
-  radutmp
-  attr_filter.accounting_response
-}
-
-session {
-  radutmp
-}
-
-post-auth {
-  exec
-  Post-Auth-Type REJECT {
-    attr_filter.access_reject
-  }
-}
-
-pre-proxy {
-}
-
-post-proxy {
-  eap
-}
@@ -1 +0,0 @@
-carol	Cleartext-Password := "Ar3etTnp"
@@ -1,18 +0,0 @@
-eap {
-  md5 {
-  }
-  default_eap_type = ttls
-  tls {
-    private_key_file = /etc/raddb/certs/aaaKey.pem
-    certificate_file = /etc/raddb/certs/aaaCert.pem
-    CA_file = /etc/raddb/certs/strongswanCert.pem
-    cipher_list = "DEFAULT"
-    dh_file = /etc/raddb/certs/dh
-    random_file = /etc/raddb/certs/random
-  }
-  ttls {
-    default_eap_type = md5
-    use_tunneled_reply = yes
-    virtual_server = "inner-tunnel"
-  }
-}
@@ -1,5 +0,0 @@
-realm strongswan.org {
-  type     = radius
-  authhost = LOCAL
-  accthost = LOCAL
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`228060123456001 EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB`