diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2011-11-22 21:18:13 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2011-11-28 21:22:51 +0100 |
| commit | db103fada4ba34c1a0ff8584fe3122231bea2277 (patch) | |
| tree | 02ac1fe2573989b8bcfd32f6385a6ee5dd0ef59b /src/libimcv/plugins/imc_attestation/imc_attestation_process.c | |
| parent | 8d851141b77718c0650373d7efd84119cece43e5 (diff) | |
| download | strongswan-db103fada4ba34c1a0ff8584fe3122231bea2277.tar.bz2 strongswan-db103fada4ba34c1a0ff8584fe3122231bea2277.tar.xz | |
refactored simple_evid_final attribute
Diffstat (limited to 'src/libimcv/plugins/imc_attestation/imc_attestation_process.c')
| -rw-r--r-- | src/libimcv/plugins/imc_attestation/imc_attestation_process.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation_process.c b/src/libimcv/plugins/imc_attestation/imc_attestation_process.c index f65f6faee..94773afe7 100644 --- a/src/libimcv/plugins/imc_attestation/imc_attestation_process.c +++ b/src/libimcv/plugins/imc_attestation/imc_attestation_process.c @@ -405,9 +405,9 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, linked_list_t *attr_list, case TCG_PTS_GEN_ATTEST_EVID: { pts_simple_evid_final_flag_t flags; - pts_meas_algorithms_t composite_algorithm = 0; + pts_meas_algorithms_t comp_hash_algorithm; pts_comp_evidence_t *evid; - chunk_t pcr_composite, quote_signature; + chunk_t pcr_composite, quote_sig; bool use_quote2; /* Send buffered Simple Component Evidences */ @@ -424,20 +424,19 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, linked_list_t *attr_list, "libimcv.plugins.imc-attestation.use_quote2", TRUE); /* Quote */ - if (!pts->quote_tpm(pts, use_quote2, &pcr_composite, "e_signature)) + if (!pts->quote_tpm(pts, use_quote2, &pcr_composite, "e_sig)) { DBG1(DBG_IMC, "error occured during TPM quote operation"); return FALSE; } /* Send Simple Evidence Final attribute */ - flags = use_quote2 ? PTS_SIMPLE_EVID_FINAL_FLAG_TPM_QUOTE_INFO2: - PTS_SIMPLE_EVID_FINAL_FLAG_TPM_QUOTE_INFO; - composite_algorithm |= PTS_MEAS_ALGO_SHA1; + flags = use_quote2 ? PTS_SIMPLE_EVID_FINAL_QUOTE_INFO2 : + PTS_SIMPLE_EVID_FINAL_QUOTE_INFO; + comp_hash_algorithm == PTS_MEAS_ALGO_SHA1; - attr = tcg_pts_attr_simple_evid_final_create(FALSE, flags, - composite_algorithm, pcr_composite, - quote_signature, chunk_empty); + attr = tcg_pts_attr_simple_evid_final_create(flags, + comp_hash_algorithm, pcr_composite, quote_sig); attr_list->insert_last(attr_list, attr); break; } |