Replaced DH_NONCE state with TPM_INIT state

[strongswan.git] / src / libimcv / plugins / imv_attestation / imv_attestation_state.c

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_state.c b/src/libimcv/plugins/imv_attestation/imv_attestation_state.c
index 0e11f75..6305dac 100644 (file)
--- a/src/libimcv/plugins/imv_attestation/imv_attestation_state.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_state.c
@@ -26,7 +26,8 @@ typedef struct request_t request_t;
  * PTS File/Directory Measurement request entry
  */
 struct request_t {
  * PTS File/Directory Measurement request entry
  */
 struct request_t {

-       int id;
+       u_int16_t id;
+       int file_id;

        bool is_dir;
 };
 
        bool is_dir;
 };
 


@@ -66,6 +67,11 @@ struct private_imv_attestation_state_t {
        TNC_IMV_Evaluation_Result eval;
 
        /**
        TNC_IMV_Evaluation_Result eval;
 
        /**

+        * Request counter
+        */
+       u_int16_t request_counter;
+
+       /**

         * List of PTS File/Directory Measurement requests
         */
        linked_list_t *requests;
         * List of PTS File/Directory Measurement requests
         */
        linked_list_t *requests;


@@ -194,19 +200,23 @@ METHOD(imv_attestation_state_t, get_pts, pts_t*,
        return this->pts;
 }
 
        return this->pts;
 }
 

-METHOD(imv_attestation_state_t, add_request, void,
-       private_imv_attestation_state_t *this, int id, bool is_dir)
+METHOD(imv_attestation_state_t, add_request, u_int16_t,
+       private_imv_attestation_state_t *this, int file_id, bool is_dir)

 {
        request_t *request;
 
        request = malloc_thing(request_t);
 {
        request_t *request;
 
        request = malloc_thing(request_t);

-       request->id = id;
+       request->id = ++this->request_counter;
+       request->file_id = file_id;

        request->is_dir = is_dir;
        this->requests->insert_last(this->requests, request);
        request->is_dir = is_dir;
        this->requests->insert_last(this->requests, request);

+
+       return this->request_counter;

 }
 
 METHOD(imv_attestation_state_t, check_off_request, bool,
 }
 
 METHOD(imv_attestation_state_t, check_off_request, bool,

-       private_imv_attestation_state_t *this, int id, bool* is_dir)
+       private_imv_attestation_state_t *this, u_int16_t id, int *file_id,
+       bool* is_dir)

 {
        enumerator_t *enumerator;
        request_t *request;
 {
        enumerator_t *enumerator;
        request_t *request;


@@ -218,6 +228,7 @@ METHOD(imv_attestation_state_t, check_off_request, bool,
                if (request->id == id)
                {
                        found = TRUE;
                if (request->id == id)
                {
                        found = TRUE;

+                       *file_id = request->file_id;

                        *is_dir = request->is_dir;
                        this->requests->remove_at(this->requests, enumerator);
                        free(request);
                        *is_dir = request->is_dir;
                        this->requests->remove_at(this->requests, enumerator);
                        free(request);