From 92582674c77d6ac87fdb764d3ec53193bfa5f5d1 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Fri, 19 Aug 2011 19:33:40 +0200 Subject: [PATCH] slightly modified IMC measurement algorithm selection --- .../plugins/imc_attestation/imc_attestation.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation.c b/src/libimcv/plugins/imc_attestation/imc_attestation.c index 167da29f5..50de915a4 100644 --- a/src/libimcv/plugins/imc_attestation/imc_attestation.c +++ b/src/libimcv/plugins/imc_attestation/imc_attestation.c @@ -552,20 +552,24 @@ TNC_Result TNC_IMC_ReceiveMessage(TNC_IMCID imc_id, attr_meas_algo = (tcg_pts_attr_meas_algo_t*)attr; selected_algorithm = attr_meas_algo->get_algorithms(attr_meas_algo); - if((supported_algorithms & PTS_MEAS_ALGO_SHA384) && - (selected_algorithm & PTS_MEAS_ALGO_SHA384)) + + if ((supported_algorithms & PTS_MEAS_ALGO_SHA384) && + (selected_algorithm & PTS_MEAS_ALGO_SHA384)) { selected_algorithm = PTS_MEAS_ALGO_SHA384; } - else if((supported_algorithms & PTS_MEAS_ALGO_SHA256) && - (selected_algorithm & PTS_MEAS_ALGO_SHA256)) + else if (selected_algorithm & PTS_MEAS_ALGO_SHA256) { selected_algorithm = PTS_MEAS_ALGO_SHA256; } - else + else if (selected_algorithm & PTS_MEAS_ALGO_SHA1) { selected_algorithm = PTS_MEAS_ALGO_SHA1; } + else + { + /* TODO generate an error message */ + } handshake_state = IMC_ATTESTATION_STATE_REQ_MEAS_ALGO; attestation_state->set_handshake_state(attestation_state,