denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch encoding of AR Identity Value from binary to UTF-8

Browse Source
This commit is contained in:
Andreas Steffen
2013-03-22 10:37:49 +01:00
parent 3db17b0ccc
commit a1bc67d6c9
14 changed files with 123 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/imv/imv_agent.c
+5 -35
View File
@@ -442,10 +442,8 @@ METHOD(imv_agent_t, create_state, TNC_Result,
while (enumerator->enumerate(enumerator, &tnc_id))
{
pen_type_t id_type, subject_type, auth_type;
int tcg_id_type, tcg_subject_type, tcg_auth_type;
u_int32_t tcg_id_type, tcg_subject_type, tcg_auth_type;
chunk_t id_value;
identification_t *ar_id;
id_type_t ike_type;
id_type = tnc_id->get_identity_type(tnc_id);
id_value = tnc_id->get_identity_value(tnc_id);
@@ -459,40 +457,12 @@ METHOD(imv_agent_t, create_state, TNC_Result,
tcg_auth_type = (auth_type.vendor_id == PEN_TCG) ?
auth_type.type : TNC_AUTH_UNKNOWN;
switch (tcg_id_type)
{
case TNC_ID_IPV4_ADDR:
ike_type = ID_IPV4_ADDR;
break;
case TNC_ID_IPV6_ADDR:
ike_type = ID_IPV6_ADDR;
break;
case TNC_ID_FQDN:
ike_type = ID_FQDN;
break;
case TNC_ID_RFC822_ADDR:
ike_type = ID_RFC822_ADDR;
break;
case TNC_ID_USER_NAME:
ike_type = ID_USER_ID;
break;
case TNC_ID_DER_ASN1_DN:
ike_type = ID_DER_ASN1_DN;
break;
case TNC_ID_DER_ASN1_GN:
ike_type = ID_IPV4_ADDR;
break;
case TNC_ID_UNKNOWN:
default:
ike_type = ID_KEY_ID;
break;
}
ar_id = identification_create_from_encoding(ike_type, id_value);
DBG2(DBG_IMV, " %N AR identity '%Y' authenticated by %N",
TNC_Subject_names, tcg_subject_type, ar_id,
DBG2(DBG_IMV, " %N AR identity '%.*s' authenticated by %N",
TNC_Subject_names, tcg_subject_type,
id_value.len, id_value.ptr,
TNC_Authentication_names, tcg_auth_type);
state->set_ar_id(state, ar_id);
state->set_ar_id(state, tcg_id_type, id_value);
}
enumerator->destroy(enumerator);
src/libimcv/imv/imv_state.h
+7 -4
View File
@@ -80,16 +80,19 @@ struct imv_state_t {
/**
* Set Access Requestor ID
*
* @param ar_id Access Requestor ID (is not going to be cloned)
* @param id_type Access Requestor TCG Standard ID Type
* @param id_value Access Requestor TCG Standard ID Value
*
*/
void (*set_ar_id)(imv_state_t *this, identification_t *ar_id);
void (*set_ar_id)(imv_state_t *this, u_int32_t id_type, chunk_t id_value);
/**
* Get Access Requestor ID
*
* @return Access Requestor ID
* @param id_type Access Requestor TCG Standard ID Type
* @return Access Requestor TCG Standard ID Value
*/
identification_t* (*get_ar_id)(imv_state_t *this);
chunk_t (*get_ar_id)(imv_state_t *this, u_int32_t *id_type);
/**
* Change the connection state