From f4cc834c45277f2b6c87729a6e4afbe20f816c50 Mon Sep 17 00:00:00 2001 From: Sansar Choinyambuu Date: Wed, 31 Aug 2011 08:16:53 +0200 Subject: [PATCH] SHA384 is set as strongest hashing algorithm --- .../plugins/imc_attestation/imc_attestation.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation.c b/src/libimcv/plugins/imc_attestation/imc_attestation.c index 9506f147c..9d70aa114 100644 --- a/src/libimcv/plugins/imc_attestation/imc_attestation.c +++ b/src/libimcv/plugins/imc_attestation/imc_attestation.c @@ -236,16 +236,16 @@ TNC_Result TNC_IMC_ReceiveMessage(TNC_IMCID imc_id, attr_cast = (tcg_pts_attr_meas_algo_t*)attr; selected_algorithm = attr_cast->get_algorithms(attr_cast); - if ((supported_algorithms & PTS_MEAS_ALGO_SHA256) && - (selected_algorithm & PTS_MEAS_ALGO_SHA256)) - { - pts->set_meas_algorithm(pts, PTS_MEAS_ALGO_SHA256); - } - else if ((supported_algorithms & PTS_MEAS_ALGO_SHA384) && + if ((supported_algorithms & PTS_MEAS_ALGO_SHA384) && (selected_algorithm & PTS_MEAS_ALGO_SHA384)) { pts->set_meas_algorithm(pts, PTS_MEAS_ALGO_SHA384); } + else if ((supported_algorithms & PTS_MEAS_ALGO_SHA256) && + (selected_algorithm & PTS_MEAS_ALGO_SHA256)) + { + pts->set_meas_algorithm(pts, PTS_MEAS_ALGO_SHA256); + } else if ((supported_algorithms & PTS_MEAS_ALGO_SHA1) && (selected_algorithm & PTS_MEAS_ALGO_SHA1)) @@ -316,14 +316,14 @@ TNC_Result TNC_IMC_ReceiveMessage(TNC_IMCID imc_id, /* Send File Measurement attribute */ selected_algorithm = pts->get_meas_algorithm(pts); meas_len = HASH_SIZE_SHA1; - if(selected_algorithm & PTS_MEAS_ALGO_SHA256) - { - meas_len = HASH_SIZE_SHA256; - } - else if (selected_algorithm & PTS_MEAS_ALGO_SHA384) + if(selected_algorithm & PTS_MEAS_ALGO_SHA384) { meas_len = HASH_SIZE_SHA384; } + else if (selected_algorithm & PTS_MEAS_ALGO_SHA256) + { + meas_len = HASH_SIZE_SHA256; + } /** * Hash the file or directory and add them as attribute