aboutsummaryrefslogtreecommitdiffstats
path: root/src/libpts
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2012-07-30 23:19:25 +0200
committerAndreas Steffen <andreas.steffen@strongswan.org>2012-07-30 23:19:25 +0200
commit6ff1d5bb329a5053520886488d7b2bd102474315 (patch)
treebeea2a3a7875b678d50499c8ac0ab01a926d0cf0 /src/libpts
parentaf8354da1a18632d14495853528f60b6636afa01 (diff)
downloadstrongswan-6ff1d5bb329a5053520886488d7b2bd102474315.tar.bz2
strongswan-6ff1d5bb329a5053520886488d7b2bd102474315.tar.xz
update state before handling status
Diffstat (limited to 'src/libpts')
-rw-r--r--src/libpts/pts/components/ita/ita_comp_ima.c36
1 files changed, 20 insertions, 16 deletions
diff --git a/src/libpts/pts/components/ita/ita_comp_ima.c b/src/libpts/pts/components/ita/ita_comp_ima.c
index dc3fc7959..a94e2b123 100644
--- a/src/libpts/pts/components/ita/ita_comp_ima.c
+++ b/src/libpts/pts/components/ita/ita_comp_ima.c
@@ -736,11 +736,12 @@ METHOD(pts_component_t, verify, status_t,
measurement, this->ima_cid,
this->kid, 1, pcr, algo);
}
+ this->state = IMA_STATE_RUNTIME;
+
if (status != SUCCESS)
{
return status;
}
- this->state = IMA_STATE_RUNTIME;
break;
case IMA_STATE_RUNTIME:
this->count++;
@@ -758,23 +759,26 @@ METHOD(pts_component_t, verify, status_t,
switch (status)
{
case SUCCESS:
- DBG3(DBG_PTS, "%#B for '%s' is ok", &measurement, uri);
+ DBG3(DBG_PTS, "%#B for '%s' is ok",
+ &measurement, uri);
this->count_ok++;
- break;
+ break;
case NOT_FOUND:
- DBG2(DBG_PTS, "%#B for '%s' not found", &measurement, uri);
- this->count_unknown++;
- break;
- case VERIFY_ERROR:
- DBG1(DBG_PTS, "%#B for '%s' differs", &measurement, uri);
- this->count_differ++;
- break;
- case FAILED:
- default:
- DBG1(DBG_PTS, "%#B for '%s' failed", &measurement, uri);
- this->count_failed++;
- }
-
+ DBG2(DBG_PTS, "%#B for '%s' not found",
+ &measurement, uri);
+ this->count_unknown++;
+ break;
+ case VERIFY_ERROR:
+ DBG1(DBG_PTS, "%#B for '%s' differs",
+ &measurement, uri);
+ this->count_differ++;
+ break;
+ case FAILED:
+ default:
+ DBG1(DBG_PTS, "%#B for '%s' failed",
+ &measurement, uri);
+ this->count_failed++;
+ }
break;
default:
return FAILED;