Deleted intermediate handshake_state

This commit is contained in:
Sansar Choinyambuu
2011-09-08 12:08:13 +02:00
committed by Andreas Steffen
parent a832232027
commit 4259bd6fb4
2 changed files with 0 additions and 53 deletions
@@ -38,11 +38,6 @@ struct private_imc_attestation_state_t {
* TNCCS connection state
*/
TNC_ConnectionState state;
/**
* IMC Attestation handshake state
*/
imc_attestation_handshake_state_t handshake_state;
/**
* PTS object
@@ -70,19 +65,6 @@ METHOD(imc_state_t, destroy, void,
free(this);
}
METHOD(imc_attestation_state_t, get_handshake_state, imc_attestation_handshake_state_t,
private_imc_attestation_state_t *this)
{
return this->handshake_state;
}
METHOD(imc_attestation_state_t, set_handshake_state, void,
private_imc_attestation_state_t *this,
imc_attestation_handshake_state_t new_state)
{
this->handshake_state = new_state;
}
METHOD(imc_attestation_state_t, get_pts, pts_t*,
private_imc_attestation_state_t *this)
{
@@ -103,13 +85,10 @@ imc_state_t *imc_attestation_state_create(TNC_ConnectionID connection_id)
.change_state = _change_state,
.destroy = _destroy,
},
.get_handshake_state = _get_handshake_state,
.set_handshake_state = _set_handshake_state,
.get_pts = _get_pts,
},
.connection_id = connection_id,
.state = TNC_CONNECTION_STATE_CREATE,
.handshake_state = IMC_ATTESTATION_STATE_INIT,
.pts = pts_create(TRUE),
);
@@ -27,23 +27,6 @@
#include <library.h>
typedef struct imc_attestation_state_t imc_attestation_state_t;
typedef enum imc_attestation_handshake_state_t imc_attestation_handshake_state_t;
/**
* IMC Attestation Handshake States (state machine)
*/
enum imc_attestation_handshake_state_t {
IMC_ATTESTATION_STATE_INIT,
IMC_ATTESTATION_STATE_REQ_PROTO_CAPS,
IMC_ATTESTATION_STATE_REQ_MEAS_ALGO,
IMC_ATTESTATION_STATE_GET_TPM_INFO,
IMC_ATTESTATION_STATE_GET_AIK,
IMC_ATTESTATION_STATE_REQ_FUNCT_COMP_EVID,
IMC_ATTESTATION_STATE_GEN_ATTEST_EVID,
IMC_ATTESTATION_STATE_REQ_FILE_METADATA,
IMC_ATTESTATION_STATE_REQ_FILE_MEAS,
IMC_ATTESTATION_STATE_REQ_IML,
};
/**
* Internal state of an imc_attestation_t connection instance
@@ -54,21 +37,6 @@ struct imc_attestation_state_t {
* imc_state_t interface
*/
imc_state_t interface;
/**
* Get state of the handshake
*
* @return the handshake state of IMC
*/
imc_attestation_handshake_state_t (*get_handshake_state)(imc_attestation_state_t *this);
/**
* Set state of the handshake
*
* @param new_state the handshake state of IMC
*/
void (*set_handshake_state)(imc_attestation_state_t *this,
imc_attestation_handshake_state_t new_state);
/**
* Get the PTS object