Use already negotiated Measurement algorithm as Hashing algorithm for Diffie Hellman...

diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation.c b/src/libimcv/plugins/imc_attestation/imc_attestation.c
index c7d1b733653d8700736e284e992e9790b738b7cd..1e0f3606f475bdc0aeeffc3a3b6d13e4b7a85931 100644 (file)
--- a/src/libimcv/plugins/imc_attestation/imc_attestation.c
+++ b/src/libimcv/plugins/imc_attestation/imc_attestation.c
@@ -313,6 +313,44 @@ TNC_Result TNC_IMC_ReceiveMessage(TNC_IMCID imc_id,
                                        attr_list->insert_last(attr_list, attr);
                                        break;
                                }
+                               case TCG_PTS_MEAS_ALGO:
+                               {
+                                       tcg_pts_attr_meas_algo_t *attr_cast;
+                                       pts_meas_algorithms_t offered_algorithms, selected_algorithm;
+
+                                       attr_cast = (tcg_pts_attr_meas_algo_t*)attr;
+                                       offered_algorithms = attr_cast->get_algorithms(attr_cast);
+
+                                       if ((supported_algorithms & PTS_MEAS_ALGO_SHA384) &&
+                                               (offered_algorithms & PTS_MEAS_ALGO_SHA384))
+                                       {
+                                               pts->set_meas_algorithm(pts, PTS_MEAS_ALGO_SHA384);
+                                       }
+                                       else if ((supported_algorithms & PTS_MEAS_ALGO_SHA256) &&
+                                                        (offered_algorithms & PTS_MEAS_ALGO_SHA256))
+                                       {
+                                               pts->set_meas_algorithm(pts, PTS_MEAS_ALGO_SHA256);
+                                       }
+
+                                       else if ((supported_algorithms & PTS_MEAS_ALGO_SHA1) &&
+                                                        (offered_algorithms & PTS_MEAS_ALGO_SHA1))
+                                       {
+                                               pts->set_meas_algorithm(pts, PTS_MEAS_ALGO_SHA1);
+                                       }
+                                       else
+                                       {
+                                               attr = pts_hash_alg_error_create(supported_algorithms);
+                                               attr_list->insert_last(attr_list, attr);
+                                               break;
+                                       }
+
+                                       /* Send Measurement Algorithm Selection attribute */
+                                       selected_algorithm = pts->get_meas_algorithm(pts);
+                                       attr = tcg_pts_attr_meas_algo_create(selected_algorithm,
+                                                                                                                TRUE);
+                                       attr_list->insert_last(attr_list, attr);
+                                       break;
+                               }
                                case TCG_PTS_DH_NONCE_PARAMS_REQ:
                                {
                                        tcg_pts_attr_dh_nonce_params_req_t *attr_cast;
@@ -417,6 +455,7 @@ TNC_Result TNC_IMC_ReceiveMessage(TNC_IMCID imc_id,
 
                                        break;
                                }
+<<<<<<< HEAD
                                case TCG_PTS_MEAS_ALGO:
                                {
                                        tcg_pts_attr_meas_algo_t *attr_cast;
@@ -455,7 +494,6 @@ TNC_Result TNC_IMC_ReceiveMessage(TNC_IMCID imc_id,
                                        attr_list->insert_last(attr_list, attr);
                                        break;
                                }
-       
                                case TCG_PTS_GET_TPM_VERSION_INFO:
                                {
                                        chunk_t tpm_version_info, attr_info;
@@ -474,7 +512,6 @@ TNC_Result TNC_IMC_ReceiveMessage(TNC_IMCID imc_id,
                                        attr_list->insert_last(attr_list, attr);
                                        break;
                                }
-       
                                case TCG_PTS_GET_AIK:
                                {
                                        certificate_t *aik;
@@ -491,8 +528,6 @@ TNC_Result TNC_IMC_ReceiveMessage(TNC_IMCID imc_id,
                                        attr_list->insert_last(attr_list, attr);
                                        break;
                                }
-       
-                               /* PTS-based Attestation Evidence */
                                case TCG_PTS_REQ_FUNCT_COMP_EVID:
                                {
                                        tcg_pts_attr_req_funct_comp_evid_t *attr_cast;

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation.c b/src/libimcv/plugins/imv_attestation/imv_attestation.c
index c8aa8202d4def05fa80071ba74fd546f9eab7f1c..bdf37abbadd3aa2e1aa2020a2f34a8ce45c3d394 100644 (file)
--- a/src/libimcv/plugins/imv_attestation/imv_attestation.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation.c
@@ -588,29 +588,15 @@ TNC_Result TNC_IMV_ReceiveMessage(TNC_IMVID imv_id,
                                        dh_group = attr_cast->get_dh_group(attr_cast);
 
                                        offered_algorithms = attr_cast->get_hash_algo_set(attr_cast);
-                                       if ((supported_algorithms & PTS_MEAS_ALGO_SHA384) &&
-                                               (offered_algorithms & PTS_MEAS_ALGO_SHA384))
-                                       {
-                                               pts->set_meas_algorithm(pts, PTS_MEAS_ALGO_SHA384);
-                                       }
-                                       else if ((supported_algorithms & PTS_MEAS_ALGO_SHA256) &&
-                                                        (offered_algorithms & PTS_MEAS_ALGO_SHA256))
-                                       {
-                                               pts->set_meas_algorithm(pts, PTS_MEAS_ALGO_SHA256);
-                                       }
-
-                                       else if ((supported_algorithms & PTS_MEAS_ALGO_SHA1) &&
-                                                        (offered_algorithms & PTS_MEAS_ALGO_SHA1))
-                                       {
-                                               pts->set_meas_algorithm(pts, PTS_MEAS_ALGO_SHA1);
-                                       }
-                                       else
+                                       if (!(offered_algorithms & PTS_MEAS_ALGO_SHA1) &&
+                                               !(offered_algorithms & PTS_MEAS_ALGO_SHA256) &&
+                                               !(offered_algorithms & PTS_MEAS_ALGO_SHA384))
                                        {
                                                attr = pts_hash_alg_error_create(supported_algorithms);
                                                attr_list->insert_last(attr_list, attr);
                                                break;
                                        }
-
+                                       /* Use already negotiated measurement algorithm */
                                        selected_algorithm = pts->get_meas_algorithm(pts);
                                        responder_nonce = attr_cast->get_responder_nonce(attr_cast);
                                        responder_pub_val = attr_cast->get_responder_pub_val(attr_cast);