various PTS fixes

diff --git a/src/libpts/plugins/imv_attestation/attest_db.c b/src/libpts/plugins/imv_attestation/attest_db.c
index 13a9f9a207fededbc0d76fb39419a679d7ddcb59..b345fc05e9f2d7eb3b24bd6a6483051fcfc7eaeb 100644 (file)
--- a/src/libpts/plugins/imv_attestation/attest_db.c
+++ b/src/libpts/plugins/imv_attestation/attest_db.c
@@ -1156,6 +1156,8 @@ METHOD(attest_db_t, add, bool,
                                                                                                this->relative, this->algo);
                if (!measurements)
                {
+                       printf("file measurement failed\n");
+                       hasher->destroy(hasher);
                        return FALSE;
                }
                if (this->fid && this->relative)

diff --git a/src/libpts/pts/components/ita/ita_comp_ima.c b/src/libpts/pts/components/ita/ita_comp_ima.c
index b41e863238caf1280692ffe2aa07707c9a730d8a..576b9de15e0a7ef2f12bdf471d4595763c437adb 100644 (file)
--- a/src/libpts/pts/components/ita/ita_comp_ima.c
+++ b/src/libpts/pts/components/ita/ita_comp_ima.c
@@ -31,7 +31,7 @@
 #define SECURITY_DIR                           "/sys/kernel/security/"
 #define IMA_BIOS_MEASUREMENTS          SECURITY_DIR "tpm0/binary_bios_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_PCR                                                10
 #define IMA_PCR_MAX                                    16

diff --git a/src/libpts/pts/pts_database.c b/src/libpts/pts/pts_database.c
index 1c1812a44dab6357f526c822ba1a355b05890510..7d6e6ababf9810f2cb037290f41bb9ee5a45b282 100644 (file)
--- a/src/libpts/pts/pts_database.c
+++ b/src/libpts/pts/pts_database.c
@@ -130,10 +130,10 @@ METHOD(pts_database_t, check_file_measurement, status_t,
        status_t status;
 
        e = this->db->query(this->db,
-               "SELECT fh.hash FROM file_hashes AS fh"
-               "JOIN files AS f ON f.id = fh.file"
+               "SELECT fh.hash FROM file_hashes AS fh "
+               "JOIN files AS f ON f.id = fh.file "
                "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);
        if (!e)
        {

diff --git a/src/libpts/pts/pts_file_meas.c b/src/libpts/pts/pts_file_meas.c
index 4eb359ce17eb21a4d375b04bbe3e2df35202820b..c19618923de3fbba359cf3244c806b51fa480f78 100644 (file)
--- a/src/libpts/pts/pts_file_meas.c
+++ b/src/libpts/pts/pts_file_meas.c
@@ -129,7 +129,7 @@ METHOD(pts_file_meas_t, check, bool,
                switch (status)
                {
                        case SUCCESS:
-                               status_msg = "ok";
+                               status_msg = "is ok";
                                count_ok++;
                                break;
                        case NOT_FOUND:
@@ -144,7 +144,7 @@ METHOD(pts_file_meas_t, check, bool,
                        default:
                                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);
        }
        enumerator->destroy(enumerator);