From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Tue, 29 Apr 2014 16:57:55 +0000 (+0200)
Subject: Updated ITA-IMA finalize messages
X-Git-Tag: 5.2.0dr2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eebc1e75b2ca61336b275c0e74704e4ac64d1f48;p=thirdparty%2Fstrongswan.git

Updated ITA-IMA finalize messages
---

diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_agent.c b/src/libpts/plugins/imv_attestation/imv_attestation_agent.c
index 9e597092f8..1e4955c2b6 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_agent.c
+++ b/src/libpts/plugins/imv_attestation/imv_attestation_agent.c
@@ -796,7 +796,7 @@ METHOD(imv_agent_if_t, solicit_recommendation, TNC_Result,
 						attestation_state->finalize_components(attestation_state,
 															   result);
 						result->write_data(result,
-								chunk_from_str("; Pending component evidence"));
+								chunk_from_str("; pending component evidence"));
 						result->write_uint8(result, '\0');
 						result_buf = result->get_buf(result);
 						result_str = result_buf.ptr;
diff --git a/src/libpts/pts/components/ita/ita_comp_ima.c b/src/libpts/pts/components/ita/ita_comp_ima.c
index e13fe14ee1..42f86a0333 100644
--- a/src/libpts/pts/components/ita/ita_comp_ima.c
+++ b/src/libpts/pts/components/ita/ita_comp_ima.c
@@ -1153,22 +1153,22 @@ METHOD(pts_component_t, finalize, bool,
 			/* close registration */
 			this->is_ima_registering = FALSE;
 
-			written = snprintf(pos, len, "registered boot aggregate evidence "
-							   "measurement; ");
+			written = snprintf(pos, len, "registered IMA boot aggregate "
+							   "evidence measurement; ");
 			pos += written;
 			len -= written;
 		}
 		if (this->count)
 		{
-			snprintf(pos, len, "processed %d file evidence measurements: "
+			snprintf(pos, len, "processed %d IMA file evidence measurements: "
 					 "%d ok, %d unknown, %d differ, %d failed",
 					 this->count, this->count_ok, this->count_unknown,
 					 this->count_differ, this->count_failed);
-			success = !this->count_differ && !this->count_failed;
 		}
 		else
 		{
-			snprintf(pos, len, "no boot aggregate evidence measurement");
+			snprintf(pos, len, "no IMA file evidence measurements");
+            success = FALSE;
 		}
 	}
 	else