summaryrefslogtreecommitdiff
path: root/src/libimcv
diff options
context:
space:
mode:
Diffstat (limited to 'src/libimcv')
-rw-r--r--src/libimcv/imcv.h3
-rw-r--r--src/libimcv/imv/data.sql24
-rw-r--r--src/libimcv/imv/imv_database.c5
-rw-r--r--src/libimcv/imv/imv_policy_manager.c2
-rw-r--r--src/libimcv/imv/tables-mysql.sql4
-rw-r--r--src/libimcv/imv/tables.sql3
-rw-r--r--src/libimcv/ita/ita_attr_settings.c2
-rw-r--r--src/libimcv/plugins/imc_scanner/imc_scanner_state.h3
-rw-r--r--src/libimcv/plugins/imc_swid/imc_swid_state.h3
-rw-r--r--src/libimcv/plugins/imc_swid/strongswan.org__strongSwan-5-6-3.swidtag (renamed from src/libimcv/plugins/imc_swid/strongswan.org__strongSwan-5-6-2.swidtag)4
-rw-r--r--src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-3.swidtag (renamed from src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-2.swidtag)4
-rw-r--r--src/libimcv/plugins/imc_test/imc_test_state.h3
-rw-r--r--src/libimcv/plugins/imv_test/imv_test_state.h3
-rw-r--r--src/libimcv/pts/pts.c2
14 files changed, 49 insertions, 16 deletions
diff --git a/src/libimcv/imcv.h b/src/libimcv/imcv.h
index 0f44d8f6f..a5eebd536 100644
--- a/src/libimcv/imcv.h
+++ b/src/libimcv/imcv.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
+ * Copyright (C) 2011 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/libimcv/imv/data.sql b/src/libimcv/imv/data.sql
index 40a0f5eeb..860573c31 100644
--- a/src/libimcv/imv/data.sql
+++ b/src/libimcv/imv/data.sql
@@ -544,6 +544,18 @@ INSERT INTO products ( /* 91 */
'Debian 8.9 x86_64'
);
+INSERT INTO products ( /* 92 */
+ name
+) VALUES (
+ 'Debian 8.10 i686'
+);
+
+INSERT INTO products ( /* 93 */
+ name
+) VALUES (
+ 'Debian 8.10 x86_64'
+);
+
/* Directories */
INSERT INTO directories ( /* 1 */
@@ -1105,6 +1117,12 @@ INSERT INTO groups_product_defaults (
INSERT INTO groups_product_defaults (
group_id, product_id
) VALUES (
+ 4, 92
+);
+
+INSERT INTO groups_product_defaults (
+ group_id, product_id
+) VALUES (
5, 2
);
@@ -1213,6 +1231,12 @@ INSERT INTO groups_product_defaults (
INSERT INTO groups_product_defaults (
group_id, product_id
) VALUES (
+ 5, 93
+);
+
+INSERT INTO groups_product_defaults (
+ group_id, product_id
+) VALUES (
6, 9
);
diff --git a/src/libimcv/imv/imv_database.c b/src/libimcv/imv/imv_database.c
index 0a18cd71b..b444abdbb 100644
--- a/src/libimcv/imv/imv_database.c
+++ b/src/libimcv/imv/imv_database.c
@@ -130,8 +130,9 @@ static bool create_session(private_imv_database_t *this, imv_session_t *session)
if (!did)
{
this->db->execute(this->db, &did,
- "INSERT INTO devices (value, product) VALUES (?, ?)",
- DB_TEXT, device, DB_INT, pid);
+ "INSERT INTO devices "
+ "(value, description, product, trusted, inactive) "
+ "VALUES (?, '', ?, 0, 0)", DB_TEXT, device, DB_INT, pid);
}
free(device);
diff --git a/src/libimcv/imv/imv_policy_manager.c b/src/libimcv/imv/imv_policy_manager.c
index 1988873e9..a0e8595ed 100644
--- a/src/libimcv/imv/imv_policy_manager.c
+++ b/src/libimcv/imv/imv_policy_manager.c
@@ -113,7 +113,7 @@ static bool iterate_enforcements(database_t *db, int device_id, int session_id,
if (latest_success)
{
/*skipping enforcement */
- printf("skipping enforcment %d\n", id);
+ printf("skipping enforcement %d\n", id);
continue;
}
diff --git a/src/libimcv/imv/tables-mysql.sql b/src/libimcv/imv/tables-mysql.sql
index cf50742c3..3e23950a3 100644
--- a/src/libimcv/imv/tables-mysql.sql
+++ b/src/libimcv/imv/tables-mysql.sql
@@ -182,7 +182,9 @@ CREATE TABLE `devices` (
`description` VARCHAR(100) DEFAULT "",
`value` VARCHAR(256) NOT NULL,
`product` INTEGER REFERENCES `products`(`id`),
- `created` INTEGER
+ `trusted` INTEGER DEFAULT 0,
+ `created` INTEGER,
+ `inactive` INTEGER DEFAULT 0
);
DROP TABLE IF EXISTS `identities`;
diff --git a/src/libimcv/imv/tables.sql b/src/libimcv/imv/tables.sql
index b50c6ed12..631969ce7 100644
--- a/src/libimcv/imv/tables.sql
+++ b/src/libimcv/imv/tables.sql
@@ -204,7 +204,8 @@ CREATE TABLE devices (
value TEXT NOT NULL,
product INTEGER REFERENCES products(id),
trusted INTEGER DEFAULT 0,
- created INTEGER
+ created INTEGER,
+ inactive INTEGER DEFAULT 0
);
DROP INDEX IF EXISTS devices_id;
CREATE INDEX devices_value ON devices (
diff --git a/src/libimcv/ita/ita_attr_settings.c b/src/libimcv/ita/ita_attr_settings.c
index b0907789e..8c364d26c 100644
--- a/src/libimcv/ita/ita_attr_settings.c
+++ b/src/libimcv/ita/ita_attr_settings.c
@@ -29,7 +29,7 @@ typedef struct private_ita_attr_settings_t private_ita_attr_settings_t;
typedef struct entry_t entry_t;
/**
- * Contains a settins name/value pair
+ * Contains a settings name/value pair
*/
struct entry_t {
char *name;
diff --git a/src/libimcv/plugins/imc_scanner/imc_scanner_state.h b/src/libimcv/plugins/imc_scanner/imc_scanner_state.h
index 3b40575e3..5fa685024 100644
--- a/src/libimcv/plugins/imc_scanner/imc_scanner_state.h
+++ b/src/libimcv/plugins/imc_scanner/imc_scanner_state.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
+ * Copyright (C) 2011 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/libimcv/plugins/imc_swid/imc_swid_state.h b/src/libimcv/plugins/imc_swid/imc_swid_state.h
index c2719d21b..c658549c8 100644
--- a/src/libimcv/plugins/imc_swid/imc_swid_state.h
+++ b/src/libimcv/plugins/imc_swid/imc_swid_state.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2013 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
+ * Copyright (C) 2013 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/libimcv/plugins/imc_swid/strongswan.org__strongSwan-5-6-2.swidtag b/src/libimcv/plugins/imc_swid/strongswan.org__strongSwan-5-6-3.swidtag
index bb4d300a9..4ce168623 100644
--- a/src/libimcv/plugins/imc_swid/strongswan.org__strongSwan-5-6-2.swidtag
+++ b/src/libimcv/plugins/imc_swid/strongswan.org__strongSwan-5-6-3.swidtag
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<SoftwareIdentity
name="strongSwan"
- tagId="strongSwan-5-6-2"
- version="5.6.2" versionScheme="alphanumeric"
+ tagId="strongSwan-5-6-3"
+ version="5.6.3" versionScheme="alphanumeric"
xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd">
<Entity
name="strongSwan Project"
diff --git a/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-2.swidtag b/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-3.swidtag
index bb4d300a9..4ce168623 100644
--- a/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-2.swidtag
+++ b/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-3.swidtag
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<SoftwareIdentity
name="strongSwan"
- tagId="strongSwan-5-6-2"
- version="5.6.2" versionScheme="alphanumeric"
+ tagId="strongSwan-5-6-3"
+ version="5.6.3" versionScheme="alphanumeric"
xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd">
<Entity
name="strongSwan Project"
diff --git a/src/libimcv/plugins/imc_test/imc_test_state.h b/src/libimcv/plugins/imc_test/imc_test_state.h
index 365caff7c..330881932 100644
--- a/src/libimcv/plugins/imc_test/imc_test_state.h
+++ b/src/libimcv/plugins/imc_test/imc_test_state.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
+ * Copyright (C) 2011 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/libimcv/plugins/imv_test/imv_test_state.h b/src/libimcv/plugins/imv_test/imv_test_state.h
index 2de5b6ffc..3e9b69521 100644
--- a/src/libimcv/plugins/imv_test/imv_test_state.h
+++ b/src/libimcv/plugins/imv_test/imv_test_state.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2011 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
+ * Copyright (C) 2011 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/libimcv/pts/pts.c b/src/libimcv/pts/pts.c
index 09ffd7160..3cf439f35 100644
--- a/src/libimcv/pts/pts.c
+++ b/src/libimcv/pts/pts.c
@@ -734,7 +734,7 @@ METHOD(pts_t, verify_quote_signature, bool,
scheme = SIGN_RSA_EMSA_PKCS1_SHA3_384;
break;
case HASH_SHA3_512:
- scheme = SIGN_RSA_EMSA_PKCS1_SHA2_512;
+ scheme = SIGN_RSA_EMSA_PKCS1_SHA3_512;
break;
default:
scheme = SIGN_UNKNOWN;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 23:00:40 +0000