From: Andreas Steffen Date: Mon, 30 Jul 2012 21:19:25 +0000 (+0200) Subject: update state before handling status X-Git-Tag: 5.0.1~241 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ff1d5bb329a5053520886488d7b2bd102474315;p=thirdparty%2Fstrongswan.git update state before handling status --- diff --git a/src/libpts/pts/components/ita/ita_comp_ima.c b/src/libpts/pts/components/ita/ita_comp_ima.c index dc3fc79594..a94e2b1233 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;