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

Use python-based swidGenerator to generated SWID tags

Browse Source
This commit is contained in:
Andreas Steffen
2014-04-15 09:21:06 +02:00
parent 8505ce1cc6
commit 8c40609f96
38 changed files with 717 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/scripts/build-baseimage
+2 -1
View File
@@ -17,7 +17,8 @@ INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev
INC=$INC,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core
INC=$INC,less,acpid,acpi-support-base,libldns-dev,libunbound-dev,dnsutils,screen
INC=$INC,gnat,gprbuild,libahven3-dev,libxmlada4.1-dev,libgmpada3-dev
INC=$INC,libalog0.4.1-base-dev,hostapd,libsoup2.4-dev
INC=$INC,libalog0.4.1-base-dev,hostapd,libsoup2.4-dev,ca-certificates,unzip
INC=$INC,python,python-setuptools
SERVICES="apache2 dbus isc-dhcp-server slapd bind9"
INC=$INC,${SERVICES// /,}
testing/scripts/recipes/014_swid_generator.mk
+16
View File
@@ -0,0 +1,16 @@
#!/usr/bin/make
PKG = swidGenerator
ZIP = $(PKG)-master.zip
SRC = https://github.com/tnc-ba/$(PKG)/archive/master.zip
all: install
$(ZIP):
wget --ca-directory="/usr/share/ca-certificates/mozilla" $(SRC) -O $(ZIP)
$(PKG)-master: $(ZIP)
unzip $(ZIP)
install: $(PKG)-master
cd $(PKG)-master && python setup.py install
testing/testing.conf
+3 -3
View File
@@ -24,14 +24,14 @@ fi
: ${TESTDIR=/srv/strongswan-testing}
# Kernel configuration
: ${KERNELVERSION=3.13.2}
: ${KERNELVERSION=3.13.5}
: ${KERNEL=linux-$KERNELVERSION}
: ${KERNELTARBALL=$KERNEL.tar.xz}
: ${KERNELCONFIG=$DIR/../config/kernel/config-3.13}
: ${KERNELPATCH=ha-3.13-abicompat.patch.bz2}
# strongSwan version used in tests
: ${SWANVERSION=5.1.2}
: ${SWANVERSION=5.2.0}
# Build directory where the guest kernel and images will be built
: ${BUILDDIR=$TESTDIR/build}
@@ -54,7 +54,7 @@ fi
: ${BASEIMGSUITE=wheezy}
: ${BASEIMGARCH=amd64}
: ${BASEIMG=$IMGDIR/debian-$BASEIMGSUITE-$BASEIMGARCH.$IMGEXT}
: ${BASEIMGMIRROR=http://cdn.debian.net/debian}
: ${BASEIMGMIRROR=http://http.debian.net/debian}
# Root image settings
# The root image is the origin of all guest images. It is a clone of the base
testing/tests/tnc/tnccs-11-radius-pts/hosts/alice/etc/pts/data1.sql
+1 -1
View File
@@ -3,7 +3,7 @@
INSERT INTO devices ( /* 1 */
value, product, created
) VALUES (
'aabbccddeeff11223344556677889900', 28, 1372330615
'aabbccddeeff11223344556677889900', 40, 1372330615
);
/* Groups Members */
testing/tests/tnc/tnccs-20-os-pts/evaltest.dat
+2 -2
View File
@@ -6,10 +6,10 @@ dave:: cat /var/log/daemon.log::PB-TNC access recommendation is 'Quarantined'::Y
dave:: cat /var/log/daemon.log::EAP method EAP_TTLS succeeded, MSK established::YES
dave:: cat /var/log/daemon.log::authentication of 'moon.strongswan.org' with EAP successful::YES
dave:: cat /var/log/daemon.log::CHILD_SA home{1} established.*TS 192.168.0.200/32 === 10.1.0.16/28::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.2 x86_64.*[email protected] - allow::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.4 x86_64.*[email protected] - allow::YES
moon:: cat /var/log/daemon.log::added group membership 'allow'::YES
moon:: cat /var/log/daemon.log::authentication of '[email protected]' with EAP successful::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.2 x86_64.*[email protected] - isolate::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.4 x86_64.*[email protected] - isolate::YES
moon:: cat /var/log/daemon.log::added group membership 'isolate'::YES
moon:: cat /var/log/daemon.log::authentication of '[email protected]' with EAP successful::YES
moon:: ipsec statusall 2> /dev/null::rw-allow.*10.1.0.0/28 === 192.168.0.100/32::YES
testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/pts/data1.sql
+1 -1
View File
@@ -3,7 +3,7 @@
INSERT INTO devices ( /* 1 */
value, product, created
) VALUES (
'aabbccddeeff11223344556677889900', 28, 1372330615
'aabbccddeeff11223344556677889900', 40, 1372330615
);
/* Groups Members */
testing/tests/tnc/tnccs-20-os/evaltest.dat
+2 -2
View File
@@ -6,10 +6,10 @@ dave:: cat /var/log/daemon.log::PB-TNC access recommendation is 'Quarantined'::Y
dave:: cat /var/log/daemon.log::EAP method EAP_TTLS succeeded, MSK established::YES
dave:: cat /var/log/daemon.log::authentication of 'moon.strongswan.org' with EAP successful::YES
dave:: cat /var/log/daemon.log::CHILD_SA home{1} established.*TS 192.168.0.200/32 === 10.1.0.16/28::YES
moon:: ipsec attest --sessions 2> /dev/null::Debian 7.2 x86_64.*[email protected] - allow::YES
moon:: ipsec attest --sessions 2> /dev/null::Debian 7.4 x86_64.*[email protected] - allow::YES
moon:: cat /var/log/daemon.log::added group membership 'allow'::YES
moon:: cat /var/log/daemon.log::authentication of '[email protected]' with EAP successful::YES
moon:: ipsec attest --sessions 2> /dev/null::Debian 7.2 x86_64.*[email protected] - isolate::YES
moon:: ipsec attest --sessions 2> /dev/null::Debian 7.4 x86_64.*[email protected] - isolate::YES
moon:: cat /var/log/daemon.log::added group membership 'isolate'::YES
moon:: cat /var/log/daemon.log::authentication of '[email protected]' with EAP successful::YES
moon:: ipsec statusall 2> /dev/null::rw-allow.*10.1.0.0/28 === 192.168.0.100/32::YES
testing/tests/tnc/tnccs-20-os/hosts/moon/etc/pts/data1.sql
+2 -2
View File
@@ -3,7 +3,7 @@
INSERT INTO devices ( /* 1 */
value, product, created
) VALUES (
'aabbccddeeff11223344556677889900', 28, 1372330615
'aabbccddeeff11223344556677889900', 40, 1372330615
);
/* Groups Members */
@@ -27,7 +27,7 @@ INSERT INTO identities (
INSERT INTO sessions (
time, connection, identity, device, product, rec
) VALUES (
NOW, 1, 1, 1, 28, 0
NOW, 1, 1, 1, 40, 0
);
/* Results */
testing/tests/tnc/tnccs-20-os/pretest.dat
+1 -1
View File
@@ -15,6 +15,6 @@ carol::sleep 1
carol::ipsec up home
dave::ipsec up home
dave::sleep 1
moon::ipsec attest --packages --product 'Debian 7.2 x86_64'
moon::ipsec attest --packages --product 'Debian 7.4 x86_64'
moon::ipsec attest --sessions
moon::ipsec attest --devices
testing/tests/tnc/tnccs-20-pt-tls/hosts/alice/etc/pts/data1.sql
+2 -2
View File
@@ -3,7 +3,7 @@
INSERT INTO devices ( /* 1 */
value, product, created
) VALUES (
'aabbccddeeff11223344556677889900', 28, 1372330615
'aabbccddeeff11223344556677889900', 40, 1372330615
);
/* Groups Members */
@@ -27,7 +27,7 @@ INSERT INTO identities (
INSERT INTO sessions (
time, connection, identity, device, product, rec
) VALUES (
NOW, 1, 1, 1, 28, 0
NOW, 1, 1, 1, 40, 0
);
/* Results */
testing/tests/tnc/tnccs-20-pt-tls/hosts/carol/etc/strongswan.conf
+4
View File
@@ -20,6 +20,10 @@ libtnccs {
}
}
libtls {
suites = TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
}
pt-tls-client {
load = curl revocation constraints pem openssl nonce tnc-tnccs tnc-imc tnccs-20
}
testing/tests/tnc/tnccs-20-pt-tls/hosts/dave/etc/strongswan.conf
+4
View File
@@ -17,6 +17,10 @@ libtnccs {
}
}
libtls {
suites = TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
}
pt-tls-client {
load = curl revocation constraints pem openssl nonce tnc-tnccs tnc-imc tnccs-20
}
testing/tests/tnc/tnccs-20-pts-no-ecc/evaltest.dat
+2 -2
View File
@@ -6,10 +6,10 @@ dave:: cat /var/log/daemon.log::PB-TNC access recommendation is 'Quarantined'::Y
dave:: cat /var/log/daemon.log::EAP method EAP_TTLS succeeded, MSK established::YES
dave:: cat /var/log/daemon.log::authentication of 'moon.strongswan.org' with EAP successful::YES
dave:: cat /var/log/daemon.log::CHILD_SA home{1} established.*TS 192.168.0.200/32 === 10.1.0.16/28::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.2 x86_64.*[email protected] - allow::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.4 x86_64.*[email protected] - allow::YES
moon:: cat /var/log/daemon.log::added group membership 'allow'::YES
moon:: cat /var/log/daemon.log::authentication of '[email protected]' with EAP successful::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.2 x86_64.*[email protected] - isolate::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.4 x86_64.*[email protected] - isolate::YES
moon:: cat /var/log/daemon.log::added group membership 'isolate'::YES
moon:: cat /var/log/daemon.log::authentication of '[email protected]' with EAP successful::YES
moon:: ipsec statusall 2> /dev/null::rw-allow.*10.1.0.0/28 === 192.168.0.100/32::YES
testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/pts/data1.sql
+1 -1
View File
@@ -3,7 +3,7 @@
INSERT INTO devices ( /* 1 */
value, product, created
) VALUES (
'aabbccddeeff11223344556677889900', 28, 1372330615
'aabbccddeeff11223344556677889900', 40, 1372330615
);
/* Groups Members */
testing/tests/tnc/tnccs-20-pts/evaltest.dat
+2 -2
View File
@@ -6,10 +6,10 @@ dave:: cat /var/log/daemon.log::PB-TNC access recommendation is 'Access Allowed'
dave:: cat /var/log/daemon.log::EAP method EAP_TTLS succeeded, MSK established::YES
dave:: cat /var/log/daemon.log::authentication of 'moon.strongswan.org' with EAP successful::YES
dave:: cat /var/log/daemon.log::CHILD_SA home{1} established.*TS 192.168.0.200/32 === 10.1.0.0/28::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.2 x86_64.*[email protected] - allow::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.4 x86_64.*[email protected] - allow::YES
moon:: cat /var/log/daemon.log::added group membership 'allow'::YES
moon:: cat /var/log/daemon.log::authentication of '[email protected]' with EAP successful::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.2 x86_64.*[email protected] - allow::YES
moon:: ipsec attest --session 2> /dev/null::Debian 7.4 x86_64.*[email protected] - allow::YES
moon:: cat /var/log/daemon.log::added group membership 'allow'::YES
moon:: cat /var/log/daemon.log::authentication of '[email protected]' with EAP successful::YES
moon:: ipsec statusall 2> /dev/null::rw-allow.*10.1.0.0/28 === 192.168.0.100/32::YES
testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/pts/data1.sql
+1 -1
View File
@@ -3,7 +3,7 @@
INSERT INTO devices ( /* 1 */
value, product, created
) VALUES (
'aabbccddeeff11223344556677889900', 28, 1372330615
'aabbccddeeff11223344556677889900', 40, 1372330615
);
/* Groups Members */