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

Finalized the implementation of TCG PTS Request Functional Component Evidence Attribute

Browse Source
This commit is contained in:
Sansar Choinyambuu
2011-09-08 12:08:09 +02:00
committed by Andreas Steffen
parent cbb7925245
commit f2b89288d0
2 changed files with 115 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/tcg/tcg_pts_attr_req_funct_comp_evid.c
+59 -29
View File
@@ -22,6 +22,16 @@
typedef struct private_tcg_pts_attr_req_funct_comp_evid_t private_tcg_pts_attr_req_funct_comp_evid_t; typedef struct private_tcg_pts_attr_req_funct_comp_evid_t private_tcg_pts_attr_req_funct_comp_evid_t;
/**
* Qualifier for Functional Component (see section 5.2 of PTS Protocol: Binding to TNC IF-M Specification)
*
*
* 0 1 2 3 4 5
* +-+-+-+-+-+-+
* |K|S| Type |
* +-+-+-+-+-+-+
*/
/** /**
* Request Functional Component Evidence (see section 3.14.1 of PTS Protocol: Binding to TNC IF-M Specification) * Request Functional Component Evidence (see section 3.14.1 of PTS Protocol: Binding to TNC IF-M Specification)
* *
@@ -51,7 +61,7 @@ typedef struct private_tcg_pts_attr_req_funct_comp_evid_t private_tcg_pts_attr_r
*/ */
#define PTS_REQ_FUNCT_COMP_EVID_SIZE 12 #define PTS_REQ_FUNCT_COMP_EVID_SIZE 12
#define PTS_REQ_FUNCT_COMP_EVID_RESERVED 0x00 #define PTS_REQ_FUNCT_COMP_FAM_BIN_ENUM 0x00
/** /**
* Private data of an tcg_pts_attr_req_funct_comp_evid_t object. * Private data of an tcg_pts_attr_req_funct_comp_evid_t object.
@@ -106,7 +116,7 @@ struct private_tcg_pts_attr_req_funct_comp_evid_t {
/** /**
* Functional Name Category Qualifier * Functional Name Category Qualifier
*/ */
u_int8_t qualifier; tcg_pts_qualifier_t qualifier;
/** /**
* Component Functional Name * Component Functional Name
@@ -149,30 +159,31 @@ METHOD(pa_tnc_attr_t, build, void,
{ {
bio_writer_t *writer; bio_writer_t *writer;
u_int8_t flags = 0; u_int8_t flags = 0;
u_int8_t family_and_qualifier = 0; u_int8_t qualifier = 0;
writer = bio_writer_create(PTS_REQ_FUNCT_COMP_EVID_SIZE); writer = bio_writer_create(PTS_REQ_FUNCT_COMP_EVID_SIZE);
/* Determine the flags to set*/ /* Determine the flags to set*/
if(this->flags & PTS_REQ_FUNC_COMP_TTC) flags += 1; if(this->flags & PTS_REQ_FUNC_COMP_FLAG_TTC) flags += 1;
if(this->flags & PTS_REQ_FUNC_COMP_VER) flags += 2; if(this->flags & PTS_REQ_FUNC_COMP_FLAG_VER) flags += 2;
if(this->flags & PTS_REQ_FUNC_COMP_CURR) flags += 4; if(this->flags & PTS_REQ_FUNC_COMP_FLAG_CURR) flags += 4;
if(this->flags & PTS_REQ_FUNC_COMP_PCR) flags += 8; if(this->flags & PTS_REQ_FUNC_COMP_FLAG_PCR) flags += 8;
writer->write_uint8(writer, flags); writer->write_uint8(writer, flags);
writer->write_uint24 (writer, this->depth); writer->write_uint24 (writer, this->depth);
writer->write_uint24 (writer, this->comp_vendor_id); writer->write_uint24 (writer, this->comp_vendor_id);
if(this->family) if(this->family != PTS_REQ_FUNCT_COMP_FAM_BIN_ENUM)
{ {
DBG1(DBG_TNC, "Functional Name Encoding Family must be set to 00"); DBG1(DBG_TNC, "Functional Name Encoding Family is not set to 00");
} }
writer->write_uint8 (writer, this->depth); qualifier += this->qualifier.type;
writer->write_uint24 (writer, this->depth); if(this->qualifier.kernel) qualifier += 16;
writer->write_uint24 (writer, this->depth); if(this->qualifier.sub_component) qualifier += 32;
writer->write_uint24 (writer, this->depth);
writer->write_uint8 (writer, qualifier);
writer->write_uint32 (writer, this->name);
this->value = chunk_clone(writer->get_buf(writer)); this->value = chunk_clone(writer->get_buf(writer));
writer->destroy(writer); writer->destroy(writer);
@@ -183,22 +194,43 @@ METHOD(pa_tnc_attr_t, process, status_t,
{ {
bio_reader_t *reader; bio_reader_t *reader;
u_int8_t flags; u_int8_t flags;
u_int8_t fam_and_qualifier;
if (this->value.len < PTS_AIK_SIZE) if (this->value.len < PTS_REQ_FUNCT_COMP_EVID_SIZE)
{ {
DBG1(DBG_TNC, "insufficient data for Attestation Identity Key"); DBG1(DBG_TNC, "insufficient data for Request Functional Component Evidence");
*offset = 0; *offset = 0;
return FAILED; return FAILED;
} }
reader = bio_reader_create(this->value); reader = bio_reader_create(this->value);
reader->read_uint8(reader, &flags); reader->read_uint8(reader, &flags);
if(flags) this->naked_pub_aik = true; if((flags >> 0) & 1) this->flags |= PTS_REQ_FUNC_COMP_FLAG_TTC;
if((flags >> 1) & 1) this->flags |= PTS_REQ_FUNC_COMP_FLAG_VER;
reader->read_data (reader, sizeof(this->value) - 1, &this->aik); if((flags >> 2) & 1) this->flags |= PTS_REQ_FUNC_COMP_FLAG_CURR;
this->aik = chunk_clone(this->aik); if((flags >> 3) & 1) this->flags |= PTS_REQ_FUNC_COMP_FLAG_PCR;
reader->destroy(reader);
reader->read_uint24(reader, &this->depth);
reader->read_uint24(reader, &this->comp_vendor_id);
reader->read_uint8(reader, &fam_and_qualifier);
if(((fam_and_qualifier >> 6) & 1) ) this->family += 64;
if(((fam_and_qualifier >> 7) & 1) ) this->family += 128;
/* TODO: Generate an IF-M error attribute indicating */
/* TCG_PTS_INVALID_NAME_FAM */
//if(&this->comp_vendor_id==PEN_TCG && this->family != PTS_REQ_FUNCT_COMP_FAM_BIN_ENUM)
//{
// DBG1(DBG_TNC, "Functional Name Encoding Family is not set to 00");
//}
if(((fam_and_qualifier >> 5) & 1) ) this->qualifier.kernel = true;
if(((fam_and_qualifier >> 4) & 1) ) this->qualifier.sub_component = true;
this->qualifier.type = ( fam_and_qualifier & 0xF );
/* TODO: Check the type is defined in pts_attr_req_funct_comp_type_t */
reader->destroy(reader);
return SUCCESS; return SUCCESS;
} }
@@ -239,17 +271,16 @@ METHOD(tcg_pts_attr_req_funct_comp_evid_t, get_family, u_int8_t,
return this->family; return this->family;
} }
METHOD(tcg_pts_attr_req_funct_comp_evid_t, get_qualifier, u_int8_t, METHOD(tcg_pts_attr_req_funct_comp_evid_t, get_qualifier, tcg_pts_qualifier_t,
private_tcg_pts_attr_req_funct_comp_evid_t *this) private_tcg_pts_attr_req_funct_comp_evid_t *this)
{ {
return this->qualifier; return this->qualifier;
} }
METHOD(tcg_pts_attr_req_funct_comp_evid_t, set_fam_qual, void, METHOD(tcg_pts_attr_req_funct_comp_evid_t, set_qualifier, void,
private_tcg_pts_attr_req_funct_comp_evid_t *this, private_tcg_pts_attr_req_funct_comp_evid_t *this,
u_int8_t family, u_int8_t qualifier) tcg_pts_qualifier_t qualifier)
{ {
this->family = family;
this->qualifier = qualifier; this->qualifier = qualifier;
} }
@@ -272,8 +303,7 @@ pa_tnc_attr_t *tcg_pts_attr_req_funct_comp_evid_create(
pts_attr_req_funct_comp_evid_flag_t flags, pts_attr_req_funct_comp_evid_flag_t flags,
u_int32_t depth, u_int32_t depth,
u_int32_t vendor_id, u_int32_t vendor_id,
u_int8_t family, tcg_pts_qualifier_t qualifier,
u_int8_t qualifier,
u_int32_t name) u_int32_t name)
{ {
private_tcg_pts_attr_req_funct_comp_evid_t *this; private_tcg_pts_attr_req_funct_comp_evid_t *this;
@@ -296,7 +326,7 @@ pa_tnc_attr_t *tcg_pts_attr_req_funct_comp_evid_create(
.get_comp_funct_name_vendor_id = _get_comp_funct_name_vendor_id, .get_comp_funct_name_vendor_id = _get_comp_funct_name_vendor_id,
.get_family = _get_family, .get_family = _get_family,
.get_qualifier = _get_qualifier, .get_qualifier = _get_qualifier,
.set_fam_qual = _set_fam_qual, .set_qualifier = _set_qualifier,
.get_comp_funct_name = _get_comp_funct_name, .get_comp_funct_name = _get_comp_funct_name,
.set_comp_funct_name = _set_comp_funct_name, .set_comp_funct_name = _set_comp_funct_name,
}, },
@@ -305,7 +335,7 @@ pa_tnc_attr_t *tcg_pts_attr_req_funct_comp_evid_create(
.flags = flags, .flags = flags,
.depth = depth, .depth = depth,
.comp_vendor_id = vendor_id, .comp_vendor_id = vendor_id,
.family = family, .family = PTS_REQ_FUNCT_COMP_FAM_BIN_ENUM,
.qualifier = qualifier, .qualifier = qualifier,
.name = name, .name = name,
); );
@@ -339,7 +369,7 @@ pa_tnc_attr_t *tcg_pts_attr_req_funct_comp_evid_create_from_data(chunk_t data)
.get_comp_funct_name_vendor_id = _get_comp_funct_name_vendor_id, .get_comp_funct_name_vendor_id = _get_comp_funct_name_vendor_id,
.get_family = _get_family, .get_family = _get_family,
.get_qualifier = _get_qualifier, .get_qualifier = _get_qualifier,
.set_fam_qual = _set_fam_qual, .set_qualifier = _set_qualifier,
.get_comp_funct_name = _get_comp_funct_name, .get_comp_funct_name = _get_comp_funct_name,
.set_comp_funct_name = _set_comp_funct_name, .set_comp_funct_name = _set_comp_funct_name,
}, },
src/libimcv/tcg/tcg_pts_attr_req_funct_comp_evid.h
+56 -33
View File
@@ -22,8 +22,10 @@
#define TCG_PTS_ATTR_REQ_FUNCT_COMP_EVID_H_ #define TCG_PTS_ATTR_REQ_FUNCT_COMP_EVID_H_
typedef struct tcg_pts_attr_req_funct_comp_evid_t tcg_pts_attr_req_funct_comp_evid_t; typedef struct tcg_pts_attr_req_funct_comp_evid_t tcg_pts_attr_req_funct_comp_evid_t;
typedef enum pts_attr_req_funct_comp_evid_qualifier_t pts_attr_req_funct_comp_evid_qualifier_t; typedef enum pts_attr_req_funct_comp_evid_flag_t pts_attr_req_funct_comp_evid_flag_t;
typedef enum pts_attr_req_funct_comp_type_t pts_attr_req_funct_comp_type_t;
typedef enum pts_attr_req_funct_comp_name_bin_enum_t pts_attr_req_funct_comp_name_bin_enum_t; typedef enum pts_attr_req_funct_comp_name_bin_enum_t pts_attr_req_funct_comp_name_bin_enum_t;
typedef struct tcg_pts_qualifier_t tcg_pts_qualifier_t;
#include "tcg_attr.h" #include "tcg_attr.h"
#include "pa_tnc/pa_tnc_attr.h" #include "pa_tnc/pa_tnc_attr.h"
@@ -33,41 +35,66 @@ typedef enum pts_attr_req_funct_comp_name_bin_enum_t pts_attr_req_funct_comp_nam
*/ */
enum pts_attr_req_funct_comp_evid_flag_t { enum pts_attr_req_funct_comp_evid_flag_t {
/** Transitive Trust Chain flag */ /** Transitive Trust Chain flag */
PTS_REQ_FUNC_COMP_TTC = (1<<0), PTS_REQ_FUNC_COMP_FLAG_TTC = (1<<0),
/** Verify Component flag */ /** Verify Component flag */
PTS_REQ_FUNC_COMP_VER = (1<<1), PTS_REQ_FUNC_COMP_FLAG_VER = (1<<1),
/** Current Evidence flag */ /** Current Evidence flag */
PTS_REQ_FUNC_COMP_CURR = (1<<2), PTS_REQ_FUNC_COMP_FLAG_CURR = (1<<2),
/** PCR Information flag */ /** PCR Information flag */
PTS_REQ_FUNC_COMP_PCR = (1<<3), PTS_REQ_FUNC_COMP_FLAG_PCR = (1<<3),
}; };
/** /**
* PTS Request Functional Component Evidence Qualifiers * PTS Component Functional Type for Qualifier field
*/ */
enum pts_attr_req_funct_comp_evid_qualifier_t { enum pts_attr_req_funct_comp_type_t {
/** Transitive Trust Chain flag */ /** Unknown */
PTS_REQ_FUNC_COMP_QUAL_UNKNOWN = (1<<0), PTS_FUNC_COMP_TYPE_UNKNOWN = 0x0,
/** Verify Component flag */ /** Trusted Platform */
PTS_REQ_FUNC_COMP_VER = (1<<1), PTS_FUNC_COMP_TYPE_TRUSTED = 0x1,
/** Current Evidence flag */ /** Operating System */
PTS_REQ_FUNC_COMP_CURR = (1<<2), PTS_FUNC_COMP_TYPE_OS = 0x2,
/** PCR Information flag */ /** Graphical User Interface */
PTS_REQ_FUNC_COMP_PCR = (1<<3), PTS_FUNC_COMP_TYPE_GUI = 0x3,
/** Application */
PTS_FUNC_COMP_TYPE_APP = 0x4,
/** Networking */
PTS_FUNC_COMP_TYPE_NET = 0x5,
/** Library */
PTS_FUNC_COMP_TYPE_LIB = 0x6,
/** TNC Defined Component */
PTS_FUNC_COMP_TYPE_TNC = 0x7,
/** All matching Components */
PTS_FUNC_COMP_TYPE_ALL = 0xF,
}; };
/** /**
* PTS Component Functional Name Binary Enumeration * PTS Component Functional Name Binary Enumeration
*/ */
enum pts_attr_req_funct_comp_name_bin_enum_t { enum pts_attr_req_funct_comp_name_bin_enum_t {
/** Transitive Trust Chain flag */ /** Ignore */
PTS_REQ_FUNC_COMP_TTC = (1<<0), PTS_FUNC_COMP_NAME_IGNORE = 0x0000,
/** Verify Component flag */ /** CRTM */
PTS_REQ_FUNC_COMP_VER = (1<<1), PTS_FUNC_COMP_NAME_CRTM = 0x0001,
/** Current Evidence flag */ /** BIOS */
PTS_REQ_FUNC_COMP_CURR = (1<<2), PTS_FUNC_COMP_NAME_BIOS = 0x0002,
/** PCR Information flag */ /** Platform Extensions */
PTS_REQ_FUNC_COMP_PCR = (1<<3), PTS_FUNC_COMP_NAME_PLAT_EXT = 0x0003,
/** Motherboard firmware */
PTS_FUNC_COMP_NAME_BOARD = 0x0004,
/** Initial Program Loader */
PTS_FUNC_COMP_NAME_INIT_LOADER = 0x0005,
/** Option ROMs */
PTS_FUNC_COMP_NAME_OPT_ROMS = 0x0006,
};
/**
* Qualifier for Functional Component
*/
struct tcg_pts_qualifier_t {
bool kernel;
bool sub_component;
pts_attr_req_funct_comp_type_t type;
}; };
/** /**
@@ -109,12 +136,11 @@ struct tcg_pts_attr_req_funct_comp_evid_t {
* @return Component Functional Name Vendor ID * @return Component Functional Name Vendor ID
*/ */
u_int32_t (*get_comp_funct_name_vendor_id)(tcg_pts_attr_req_funct_comp_evid_t *this); u_int32_t (*get_comp_funct_name_vendor_id)(tcg_pts_attr_req_funct_comp_evid_t *this);
/** /**
* Get Family * Get Family
* *
* @return Functional Name Encoding Family * @return Functional Name Family
*/ */
u_int8_t (*get_family)(tcg_pts_attr_req_funct_comp_evid_t *this); u_int8_t (*get_family)(tcg_pts_attr_req_funct_comp_evid_t *this);
@@ -123,16 +149,15 @@ struct tcg_pts_attr_req_funct_comp_evid_t {
* *
* @return Functional Name Category Qualifier * @return Functional Name Category Qualifier
*/ */
u_int8_t (*get_qualifier)(tcg_pts_attr_req_funct_comp_evid_t *this); tcg_pts_qualifier_t (*get_qualifier)(tcg_pts_attr_req_funct_comp_evid_t *this);
/** /**
* Set family and qualifier for Component Functional Name * Set qualifier for Component Functional Name
* *
* @param family Functional Name Encoding Family
* @param qualifier Functional Name Category Qualifier * @param qualifier Functional Name Category Qualifier
*/ */
void (*set_fam_qual)(tcg_pts_attr_req_funct_comp_evid_t *this, u_int8_t family, void (*set_qualifier)(tcg_pts_attr_req_funct_comp_evid_t *this,
u_int8_t qualifier); tcg_pts_qualifier_t qualifier);
/** /**
* Get Component Functional Name * Get Component Functional Name
@@ -159,15 +184,13 @@ struct tcg_pts_attr_req_funct_comp_evid_t {
* @param flags Set of flags * @param flags Set of flags
* @param depth Sub-component Depth * @param depth Sub-component Depth
* @param vendor_id Component Functional Name Vendor ID * @param vendor_id Component Functional Name Vendor ID
* @param family Functional Name Encoding Family
* @param qualifier Functional Name Category Qualifier * @param qualifier Functional Name Category Qualifier
* @param name Component Functional Name * @param name Component Functional Name
*/ */
pa_tnc_attr_t* tcg_pts_attr_req_funct_comp_evid_create(pts_attr_req_funct_comp_evid_flag_t flags, pa_tnc_attr_t* tcg_pts_attr_req_funct_comp_evid_create(pts_attr_req_funct_comp_evid_flag_t flags,
u_int32_t depth, u_int32_t depth,
u_int32_t vendor_id, u_int32_t vendor_id,
u_int8_t family, tcg_pts_qualifier_t qualifier,
u_int8_t qualifier,
u_int32_t name); u_int32_t name);
/** /**