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

various PTS fixes

Browse Source
This commit is contained in:
Andreas Steffen
2012-07-17 16:38:55 +02:00
parent 68b1a559cc
commit 20ec024a94
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/plugins/imv_attestation/attest_db.c
+2
View File
@@ -1156,6 +1156,8 @@ METHOD(attest_db_t, add, bool,
this->relative, this->algo); this->relative, this->algo);
if (!measurements) if (!measurements)
{ {
printf("file measurement failed\n");
hasher->destroy(hasher);
return FALSE; return FALSE;
} }
if (this->fid && this->relative) if (this->fid && this->relative)
src/libpts/pts/components/ita/ita_comp_ima.c
+1 -1
View File
@@ -31,7 +31,7 @@
#define SECURITY_DIR "/sys/kernel/security/" #define SECURITY_DIR "/sys/kernel/security/"
#define IMA_BIOS_MEASUREMENTS SECURITY_DIR "tpm0/binary_bios_measurements" #define IMA_BIOS_MEASUREMENTS SECURITY_DIR "tpm0/binary_bios_measurements"
#define IMA_RUNTIME_MEASUREMENTS SECURITY_DIR "ima/binary_runtime_measurements" #define IMA_RUNTIME_MEASUREMENTS SECURITY_DIR "ima/binary_runtime_measurements"
#define IMA_MEASUREMENT_BATCH_SIZE 1000 #define IMA_MEASUREMENT_BATCH_SIZE 200
#define IMA_EVENT_NAME_LEN_MAX 255 #define IMA_EVENT_NAME_LEN_MAX 255
#define IMA_PCR 10 #define IMA_PCR 10
#define IMA_PCR_MAX 16 #define IMA_PCR_MAX 16
src/libpts/pts/pts_database.c
+3 -3
View File
@@ -130,10 +130,10 @@ METHOD(pts_database_t, check_file_measurement, status_t,
status_t status; status_t status;
e = this->db->query(this->db, e = this->db->query(this->db,
"SELECT fh.hash FROM file_hashes AS fh" "SELECT fh.hash FROM file_hashes AS fh "
"JOIN files AS f ON f.id = fh.file" "JOIN files AS f ON f.id = fh.file "
"JOIN products AS p ON p.id = fh.product " "JOIN products AS p ON p.id = fh.product "
"WHERE p.product = ? AND f.file = ? AND fh.algo = ?", "WHERE p.name = ? AND f.path = ? AND fh.algo = ?",
DB_TEXT, product, DB_TEXT, filename, DB_INT, algo, DB_BLOB); DB_TEXT, product, DB_TEXT, filename, DB_INT, algo, DB_BLOB);
if (!e) if (!e)
{ {
src/libpts/pts/pts_file_meas.c
+2 -2
View File
@@ -129,7 +129,7 @@ METHOD(pts_file_meas_t, check, bool,
switch (status) switch (status)
{ {
case SUCCESS: case SUCCESS:
status_msg = "ok"; status_msg = "is ok";
count_ok++; count_ok++;
break; break;
case NOT_FOUND: case NOT_FOUND:
@@ -144,7 +144,7 @@ METHOD(pts_file_meas_t, check, bool,
default: default:
status_msg = "failed"; status_msg = "failed";
} }
DBG2(DBG_PTS, " %#B for '%s' - %s", &entry->measurement, DBG2(DBG_PTS, " %#B for '%s' %s", &entry->measurement,
entry->filename, status_msg); entry->filename, status_msg);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);