From 9b8137fdd386cd24a69644eb696a82a5bc47f8e2 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Thu, 5 Sep 2013 11:29:23 +0200 Subject: [PATCH] Added tags table and some tag samples --- src/libimcv/imv/data.sql | 81 +++++++++++++++++- src/libimcv/imv/tables.sql | 11 +++ testing/hosts/default/etc/pts/data.sql | 83 ++++++++++++++++++- testing/hosts/default/etc/pts/tables.sql | 13 +++ .../hosts/alice/etc/pts/data.sql | 82 +++++++++++++++++- 5 files changed, 267 insertions(+), 3 deletions(-) diff --git a/src/libimcv/imv/data.sql b/src/libimcv/imv/data.sql index 7b5995aa0..4d7087845 100644 --- a/src/libimcv/imv/data.sql +++ b/src/libimcv/imv/data.sql @@ -885,13 +885,92 @@ INSERT INTO regids ( /* 6 */ INSERT INTO regids ( /* 7 */ name ) VALUES ( - 'regid.2002-08.org.sqlite' + 'regid.1998-12.org.openssl' ); INSERT INTO regids ( /* 8 */ name +) VALUES ( + 'regid.1998-01.org.samba' +); + +INSERT INTO regids ( /* 9 */ + name +) VALUES ( + 'regid.2002-08.org.sqlite' +); + +INSERT INTO regids ( /* 10 */ + name ) VALUES ( 'regid.2004-03.org.strongswan' ); +/* Tags */ + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 2, 'Windows-8-Pro' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'apache-2-2-22-13' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'bind-9-8-4-dfsg' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libsqlite-3-7-13-1' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libssl-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libssl-dev-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libssl-doc-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'openssl-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'smbclient-3-6-6-6' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'sqlite-3-7-13-1' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 10, 'strongSwan-5-1-1' +); diff --git a/src/libimcv/imv/tables.sql b/src/libimcv/imv/tables.sql index 6b8522dc5..a0f3a4e8d 100644 --- a/src/libimcv/imv/tables.sql +++ b/src/libimcv/imv/tables.sql @@ -242,4 +242,15 @@ CREATE INDEX regids_name ON regids ( name ); +DROP TABLE IF EXISTS tags; +CREATE TABLE tags ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + regid INTEGER NOT NULL REFERENCES regids(id), + unique_sw_id TEXT NOT NULL, + value TEXT +); +DROP INDEX IF EXISTS tags_name; +CREATE INDEX tags_unique_sw_id ON tags ( + unique_sw_id +); diff --git a/testing/hosts/default/etc/pts/data.sql b/testing/hosts/default/etc/pts/data.sql index a6ea8f83e..4d7087845 100644 --- a/testing/hosts/default/etc/pts/data.sql +++ b/testing/hosts/default/etc/pts/data.sql @@ -885,11 +885,92 @@ INSERT INTO regids ( /* 6 */ INSERT INTO regids ( /* 7 */ name ) VALUES ( - 'regid.2002-08.org.sqlite' + 'regid.1998-12.org.openssl' ); INSERT INTO regids ( /* 8 */ name +) VALUES ( + 'regid.1998-01.org.samba' +); + +INSERT INTO regids ( /* 9 */ + name +) VALUES ( + 'regid.2002-08.org.sqlite' +); + +INSERT INTO regids ( /* 10 */ + name ) VALUES ( 'regid.2004-03.org.strongswan' ); + +/* Tags */ + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 2, 'Windows-8-Pro' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'apache-2-2-22-13' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'bind-9-8-4-dfsg' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libsqlite-3-7-13-1' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libssl-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libssl-dev-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libssl-doc-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'openssl-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'smbclient-3-6-6-6' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'sqlite-3-7-13-1' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 10, 'strongSwan-5-1-1' +); + diff --git a/testing/hosts/default/etc/pts/tables.sql b/testing/hosts/default/etc/pts/tables.sql index 85db3188a..a0f3a4e8d 100644 --- a/testing/hosts/default/etc/pts/tables.sql +++ b/testing/hosts/default/etc/pts/tables.sql @@ -241,3 +241,16 @@ DROP INDEX IF EXISTS regids_name; CREATE INDEX regids_name ON regids ( name ); + +DROP TABLE IF EXISTS tags; +CREATE TABLE tags ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + regid INTEGER NOT NULL REFERENCES regids(id), + unique_sw_id TEXT NOT NULL, + value TEXT +); +DROP INDEX IF EXISTS tags_name; +CREATE INDEX tags_unique_sw_id ON tags ( + unique_sw_id +); + diff --git a/testing/tests/tnc/tnccs-20-pt-tls/hosts/alice/etc/pts/data.sql b/testing/tests/tnc/tnccs-20-pt-tls/hosts/alice/etc/pts/data.sql index 2049b9003..6c6e97b45 100644 --- a/testing/tests/tnc/tnccs-20-pt-tls/hosts/alice/etc/pts/data.sql +++ b/testing/tests/tnc/tnccs-20-pt-tls/hosts/alice/etc/pts/data.sql @@ -955,11 +955,91 @@ INSERT INTO regids ( /* 6 */ INSERT INTO regids ( /* 7 */ name ) VALUES ( - 'regid.2002-08.org.sqlite' + 'regid.1998-12.org.openssl' ); INSERT INTO regids ( /* 8 */ name +) VALUES ( + 'regid.1998-01.org.samba' +); + +INSERT INTO regids ( /* 9 */ + name +) VALUES ( + 'regid.2002-08.org.sqlite' +); + +INSERT INTO regids ( /* 10 */ + name ) VALUES ( 'regid.2004-03.org.strongswan' ); + +/* Tags */ + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 2, 'Windows-8-Pro' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'apache-2-2-22-13' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'bind-9-8-4-dfsg' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libsqlite-3-7-13-1' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libssl-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libssl-dev-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'libssl-doc-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'openssl-1-0-1e-2' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'smbclient-3-6-6-6' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 5, 'sqlite-3-7-13-1' +); + +INSERT INTO tags ( + regid, unique_sw_id +) VALUES ( + 10, 'strongSwan-5-1-1' +);