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

Use standard unsigned integer types

Browse Source
This commit is contained in:
Andreas Steffen
2016-03-24 18:52:48 +01:00
parent b210369314
commit b12c53ce77
584 changed files with 3430 additions and 3430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/generic/generic_attr_bool.c
+2 -2
View File
@@ -118,11 +118,11 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_generic_attr_bool_t *this, u_int32_t *offset)
private_generic_attr_bool_t *this, uint32_t *offset)
{
enum_name_t *pa_attr_names;
bio_reader_t *reader;
u_int32_t status;
uint32_t status;
*offset = 0;
src/libimcv/generic/generic_attr_chunk.c
+1 -1
View File
@@ -93,7 +93,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_generic_attr_chunk_t *this, u_int32_t *offset)
private_generic_attr_chunk_t *this, uint32_t *offset)
{
enum_name_t *pa_attr_names;
*offset = 0;
src/libimcv/generic/generic_attr_string.c
+1 -1
View File
@@ -88,7 +88,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_generic_attr_string_t *this, u_int32_t *offset)
private_generic_attr_string_t *this, uint32_t *offset)
{
enum_name_t *pa_attr_names;
u_char *pos;
src/libimcv/ietf/ietf_attr.c
+1 -1
View File
@@ -47,7 +47,7 @@ ENUM(ietf_attr_names, IETF_ATTR_TESTING, IETF_ATTR_FACTORY_DEFAULT_PWD_ENABLED,
/**
* See header
*/
pa_tnc_attr_t* ietf_attr_create_from_data(u_int32_t type, size_t length,
pa_tnc_attr_t* ietf_attr_create_from_data(uint32_t type, size_t length,
chunk_t value)
{
switch (type)
src/libimcv/ietf/ietf_attr.h
+1 -1
View File
@@ -59,7 +59,7 @@ extern enum_name_t *ietf_attr_names;
* @param length attribute length
* @param value attribute value or segment
*/
pa_tnc_attr_t* ietf_attr_create_from_data(u_int32_t type, size_t length,
pa_tnc_attr_t* ietf_attr_create_from_data(uint32_t type, size_t length,
chunk_t value);
#endif /** IETF_ATTR_H_ @}*/
src/libimcv/ietf/ietf_attr_assess_result.c
+4 -4
View File
@@ -67,7 +67,7 @@ struct private_ietf_attr_assess_result_t {
/**
* Assessment Result
*/
u_int32_t result;
uint32_t result;
/**
* Reference count
@@ -117,7 +117,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_assess_result_t *this, u_int32_t *offset)
private_ietf_attr_assess_result_t *this, uint32_t *offset)
{
bio_reader_t *reader;
@@ -162,7 +162,7 @@ METHOD(pa_tnc_attr_t, destroy, void,
}
}
METHOD(ietf_attr_assess_result_t, get_result, u_int32_t,
METHOD(ietf_attr_assess_result_t, get_result, uint32_t,
private_ietf_attr_assess_result_t *this)
{
return this->result;
@@ -171,7 +171,7 @@ METHOD(ietf_attr_assess_result_t, get_result, u_int32_t,
/**
* Described in header.
*/
pa_tnc_attr_t *ietf_attr_assess_result_create(u_int32_t result)
pa_tnc_attr_t *ietf_attr_assess_result_create(uint32_t result)
{
private_ietf_attr_assess_result_t *this;
src/libimcv/ietf/ietf_attr_assess_result.h
+2 -2
View File
@@ -43,7 +43,7 @@ struct ietf_attr_assess_result_t {
*
* @return Assessment Result
*/
u_int32_t (*get_result)(ietf_attr_assess_result_t *this);
uint32_t (*get_result)(ietf_attr_assess_result_t *this);
};
@@ -51,7 +51,7 @@ struct ietf_attr_assess_result_t {
* Creates an ietf_attr_assess_result_t object
*
*/
pa_tnc_attr_t* ietf_attr_assess_result_create(u_int32_t result);
pa_tnc_attr_t* ietf_attr_assess_result_create(uint32_t result);
/**
* Creates an ietf_attr_assess_result_t object from received data
src/libimcv/ietf/ietf_attr_attr_request.c
+5 -5
View File
@@ -136,7 +136,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(ietf_attr_attr_request_t, add, void,
private_ietf_attr_attr_request_t *this, pen_t vendor_id, u_int32_t type)
private_ietf_attr_attr_request_t *this, pen_t vendor_id, uint32_t type)
{
enum_name_t *pa_attr_names;
pen_type_t *entry;
@@ -160,12 +160,12 @@ METHOD(ietf_attr_attr_request_t, add, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_attr_request_t *this, u_int32_t *offset)
private_ietf_attr_attr_request_t *this, uint32_t *offset)
{
bio_reader_t *reader;
pen_t vendor_id;
u_int32_t type;
u_int8_t reserved;
uint32_t type;
uint8_t reserved;
int count;
*offset = 0;
@@ -228,7 +228,7 @@ METHOD(ietf_attr_attr_request_t, create_enumerator, enumerator_t*,
/**
* Described in header.
*/
pa_tnc_attr_t *ietf_attr_attr_request_create(pen_t vendor_id, u_int32_t type)
pa_tnc_attr_t *ietf_attr_attr_request_create(pen_t vendor_id, uint32_t type)
{
private_ietf_attr_attr_request_t *this;
src/libimcv/ietf/ietf_attr_attr_request.h
+2 -2
View File
@@ -44,7 +44,7 @@ struct ietf_attr_attr_request_t {
* @param vendor_id Attribute Vendor ID
* @param type Attribute Type
*/
void (*add)(ietf_attr_attr_request_t *this, pen_t vendor_id, u_int32_t type);
void (*add)(ietf_attr_attr_request_t *this, pen_t vendor_id, uint32_t type);
/**
* Creates an enumerator over all attribute types contained
@@ -59,7 +59,7 @@ struct ietf_attr_attr_request_t {
* Creates an ietf_attr_attr_request_t object
*
*/
pa_tnc_attr_t* ietf_attr_attr_request_create(pen_t vendor_id, u_int32_t type);
pa_tnc_attr_t* ietf_attr_attr_request_create(pen_t vendor_id, uint32_t type);
/**
* @param length Total length of attribute value
src/libimcv/ietf/ietf_attr_fwd_enabled.c
+2 -2
View File
@@ -117,10 +117,10 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_fwd_enabled_t *this, u_int32_t *offset)
private_ietf_attr_fwd_enabled_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int32_t fwd_status;
uint32_t fwd_status;
*offset = 0;
src/libimcv/ietf/ietf_attr_installed_packages.c
+2 -2
View File
@@ -169,13 +169,13 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_installed_packages_t *this, u_int32_t *offset)
private_ietf_attr_installed_packages_t *this, uint32_t *offset)
{
bio_reader_t *reader;
package_entry_t *entry;
status_t status = NEED_MORE;
chunk_t name, version;
u_int16_t reserved;
uint16_t reserved;
u_char *pos;
if (this->offset == 0)
src/libimcv/ietf/ietf_attr_numeric_version.c
+13 -13
View File
@@ -73,27 +73,27 @@ struct private_ietf_attr_numeric_version_t {
/**
* Major Version Number
*/
u_int32_t major_version;
uint32_t major_version;
/**
* Minor Version Number
*/
u_int32_t minor_version;
uint32_t minor_version;
/**
* IBuild Number
*/
u_int32_t build;
uint32_t build;
/**
* Service Pack Major Number
*/
u_int16_t service_pack_major;
uint16_t service_pack_major;
/**
* Service Pack Minor Number
*/
u_int16_t service_pack_minor;
uint16_t service_pack_minor;
/**
* Reference count
@@ -148,7 +148,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_numeric_version_t *this, u_int32_t *offset)
private_ietf_attr_numeric_version_t *this, uint32_t *offset)
{
bio_reader_t *reader;
@@ -198,7 +198,7 @@ METHOD(pa_tnc_attr_t, destroy, void,
}
METHOD(ietf_attr_numeric_version_t, get_version, void,
private_ietf_attr_numeric_version_t *this, u_int32_t *major, u_int32_t *minor)
private_ietf_attr_numeric_version_t *this, uint32_t *major, uint32_t *minor)
{
if (major)
{
@@ -210,14 +210,14 @@ METHOD(ietf_attr_numeric_version_t, get_version, void,
}
}
METHOD(ietf_attr_numeric_version_t, get_build, u_int32_t,
METHOD(ietf_attr_numeric_version_t, get_build, uint32_t,
private_ietf_attr_numeric_version_t *this)
{
return this->build;
}
METHOD(ietf_attr_numeric_version_t, get_service_pack, void,
private_ietf_attr_numeric_version_t *this, u_int16_t *major, u_int16_t *minor)
private_ietf_attr_numeric_version_t *this, uint16_t *major, uint16_t *minor)
{
if (major)
{
@@ -232,10 +232,10 @@ METHOD(ietf_attr_numeric_version_t, get_service_pack, void,
/**
* Described in header.
*/
pa_tnc_attr_t *ietf_attr_numeric_version_create(u_int32_t major, u_int32_t minor,
u_int32_t build,
u_int16_t service_pack_major,
u_int16_t service_pack_minor)
pa_tnc_attr_t *ietf_attr_numeric_version_create(uint32_t major, uint32_t minor,
uint32_t build,
uint16_t service_pack_major,
uint16_t service_pack_minor)
{
private_ietf_attr_numeric_version_t *this;
src/libimcv/ietf/ietf_attr_numeric_version.h
+7 -7
View File
@@ -45,7 +45,7 @@ struct ietf_attr_numeric_version_t {
* @param minor Minor Version Number
*/
void (*get_version)(ietf_attr_numeric_version_t *this,
u_int32_t *major, u_int32_t *minor);
uint32_t *major, uint32_t *minor);
/**
* Gets the Build Number
@@ -53,7 +53,7 @@ struct ietf_attr_numeric_version_t {
* @param major Major Version Number
* @param minor Minor Version Number
*/
u_int32_t (*get_build)(ietf_attr_numeric_version_t *this);
uint32_t (*get_build)(ietf_attr_numeric_version_t *this);
/**
* Gets the Major and Minor Numbers of the Service Pack
@@ -62,17 +62,17 @@ struct ietf_attr_numeric_version_t {
* @param minor Servcie Pack Minor Number
*/
void (*get_service_pack)(ietf_attr_numeric_version_t *this,
u_int16_t *major, u_int16_t *minor);
uint16_t *major, uint16_t *minor);
};
/**
* Creates an ietf_attr_numeric_version_t object
*
*/
pa_tnc_attr_t* ietf_attr_numeric_version_create(u_int32_t major, u_int32_t minor,
u_int32_t build,
u_int16_t service_pack_major,
u_int16_t service_pack_minor);
pa_tnc_attr_t* ietf_attr_numeric_version_create(uint32_t major, uint32_t minor,
uint32_t build,
uint16_t service_pack_major,
uint16_t service_pack_minor);
/**
* Creates an ietf_attr_numeric_version_t object from received data
src/libimcv/ietf/ietf_attr_op_status.c
+7 -7
View File
@@ -93,12 +93,12 @@ struct private_ietf_attr_op_status_t {
/**
* Status
*/
u_int8_t status;
uint8_t status;
/**
* Result
*/
u_int8_t result;
uint8_t result;
/**
* Last Use
@@ -164,11 +164,11 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_op_status_t *this, u_int32_t *offset)
private_ietf_attr_op_status_t *this, uint32_t *offset)
{
bio_reader_t *reader;
chunk_t last_use;
u_int16_t reserved;
uint16_t reserved;
struct tm t;
*offset = 0;
@@ -245,13 +245,13 @@ METHOD(pa_tnc_attr_t, destroy, void,
}
}
METHOD(ietf_attr_op_status_t, get_status, u_int8_t,
METHOD(ietf_attr_op_status_t, get_status, uint8_t,
private_ietf_attr_op_status_t *this)
{
return this->status;
}
METHOD(ietf_attr_op_status_t, get_result, u_int8_t,
METHOD(ietf_attr_op_status_t, get_result, uint8_t,
private_ietf_attr_op_status_t *this)
{
return this->result;
@@ -266,7 +266,7 @@ METHOD(ietf_attr_op_status_t, get_last_use, time_t,
/**
* Described in header.
*/
pa_tnc_attr_t *ietf_attr_op_status_create(u_int8_t status, u_int8_t result,
pa_tnc_attr_t *ietf_attr_op_status_create(uint8_t status, uint8_t result,
time_t last_use)
{
private_ietf_attr_op_status_t *this;
src/libimcv/ietf/ietf_attr_op_status.h
+3 -3
View File
@@ -70,14 +70,14 @@ struct ietf_attr_op_status_t {
*
* @return Operational Status
*/
u_int8_t (*get_status)(ietf_attr_op_status_t *this);
uint8_t (*get_status)(ietf_attr_op_status_t *this);
/**
* Gets the Operational Result
*
* @return Operational Result
*/
u_int8_t (*get_result)(ietf_attr_op_status_t *this);
uint8_t (*get_result)(ietf_attr_op_status_t *this);
/**
* Gets the time of last use
@@ -94,7 +94,7 @@ struct ietf_attr_op_status_t {
* @param result Operational Result
* @param last_use Time of last use
*/
pa_tnc_attr_t* ietf_attr_op_status_create(u_int8_t status, u_int8_t result,
pa_tnc_attr_t* ietf_attr_op_status_create(uint8_t status, uint8_t result,
time_t last_use);
/**
src/libimcv/ietf/ietf_attr_port_filter.c
+8 -8
View File
@@ -30,8 +30,8 @@ typedef struct port_entry_t port_entry_t;
*/
struct port_entry_t {
bool blocked;
u_int8_t protocol;
u_int16_t port;
uint8_t protocol;
uint16_t port;
};
/**
@@ -142,11 +142,11 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_port_filter_t *this, u_int32_t *offset)
private_ietf_attr_port_filter_t *this, uint32_t *offset)
{
bio_reader_t *reader;
port_entry_t *entry;
u_int8_t blocked;
uint8_t blocked;
*offset = 0;
@@ -201,8 +201,8 @@ METHOD(pa_tnc_attr_t, destroy, void,
}
METHOD(ietf_attr_port_filter_t, add_port, void,
private_ietf_attr_port_filter_t *this, bool blocked, u_int8_t protocol,
u_int16_t port)
private_ietf_attr_port_filter_t *this, bool blocked, uint8_t protocol,
uint16_t port)
{
port_entry_t *entry;
@@ -217,8 +217,8 @@ METHOD(ietf_attr_port_filter_t, add_port, void,
* Enumerate port filter entries
*/
static bool port_filter(void *null, port_entry_t **entry,
bool *blocked, void *i2, u_int8_t *protocol, void *i3,
u_int16_t *port)
bool *blocked, void *i2, uint8_t *protocol, void *i3,
uint16_t *port)
{
*blocked = (*entry)->blocked;
*protocol = (*entry)->protocol;
src/libimcv/ietf/ietf_attr_port_filter.h
+2 -2
View File
@@ -46,11 +46,11 @@ struct ietf_attr_port_filter_t {
* @param port TCP/UDP port number
*/
void (*add_port)(ietf_attr_port_filter_t *this, bool blocked,
u_int8_t protocol, u_int16_t port);
uint8_t protocol, uint16_t port);
/**
* Enumerates over all ports
* Format: bool *blocked, u_int8_t *protocol, u_int16_t *port
* Format: bool *blocked, uint8_t *protocol, uint16_t *port
*
* @return enumerator
*/
src/libimcv/ietf/ietf_attr_product_info.c
+4 -4
View File
@@ -74,7 +74,7 @@ struct private_ietf_attr_product_info_t {
/**
* Product ID
*/
u_int16_t product_id;
uint16_t product_id;
/**
* Product Name
@@ -131,7 +131,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_product_info_t *this, u_int32_t *offset)
private_ietf_attr_product_info_t *this, uint32_t *offset)
{
bio_reader_t *reader;
chunk_t product_name;
@@ -190,7 +190,7 @@ METHOD(pa_tnc_attr_t, destroy, void,
}
METHOD(ietf_attr_product_info_t, get_info, chunk_t,
private_ietf_attr_product_info_t *this, pen_t *vendor_id, u_int16_t *id)
private_ietf_attr_product_info_t *this, pen_t *vendor_id, uint16_t *id)
{
if (vendor_id)
{
@@ -206,7 +206,7 @@ METHOD(ietf_attr_product_info_t, get_info, chunk_t,
/**
* Described in header.
*/
pa_tnc_attr_t *ietf_attr_product_info_create(pen_t vendor_id, u_int16_t id,
pa_tnc_attr_t *ietf_attr_product_info_create(pen_t vendor_id, uint16_t id,
chunk_t name)
{
private_ietf_attr_product_info_t *this;
src/libimcv/ietf/ietf_attr_product_info.h
+2 -2
View File
@@ -46,7 +46,7 @@ struct ietf_attr_product_info_t {
* @return Product Name
*/
chunk_t (*get_info)(ietf_attr_product_info_t *this,
pen_t *vendor_id, u_int16_t *id);
pen_t *vendor_id, uint16_t *id);
};
@@ -54,7 +54,7 @@ struct ietf_attr_product_info_t {
* Creates an ietf_attr_product_info_t object
*
*/
pa_tnc_attr_t* ietf_attr_product_info_create(pen_t vendor_id, u_int16_t id,
pa_tnc_attr_t* ietf_attr_product_info_create(pen_t vendor_id, uint16_t id,
chunk_t name);
/**
src/libimcv/ietf/ietf_attr_remediation_instr.c
+2 -2
View File
@@ -165,10 +165,10 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_remediation_instr_t *this, u_int32_t *offset)
private_ietf_attr_remediation_instr_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int8_t reserved;
uint8_t reserved;
status_t status = SUCCESS;
u_char *pos;
src/libimcv/ietf/ietf_attr_string_version.c
+1 -1
View File
@@ -134,7 +134,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_string_version_t *this, u_int32_t *offset)
private_ietf_attr_string_version_t *this, uint32_t *offset)
{
bio_reader_t *reader;
status_t status = FAILED;
src/libimcv/imc/imc_agent.c
+4 -4
View File
@@ -46,7 +46,7 @@ struct private_imc_agent_t {
/**
* number of message types registered by IMC
*/
u_int32_t type_count;
uint32_t type_count;
/**
* ID of IMC as assigned by TNCC
@@ -320,7 +320,7 @@ static char* get_str_attribute(private_imc_agent_t *this, TNC_ConnectionID id,
/**
* Read an UInt32 attribute
*/
static u_int32_t get_uint_attribute(private_imc_agent_t *this, TNC_ConnectionID id,
static uint32_t get_uint_attribute(private_imc_agent_t *this, TNC_ConnectionID id,
TNC_AttributeID attribute_id)
{
TNC_UInt32 len;
@@ -341,7 +341,7 @@ METHOD(imc_agent_t, create_state, TNC_Result,
TNC_ConnectionID conn_id;
char *tnccs_p = NULL, *tnccs_v = NULL, *t_p = NULL, *t_v = NULL;
bool has_long = FALSE, has_excl = FALSE, has_soh = FALSE;
u_int32_t max_msg_len;
uint32_t max_msg_len;
conn_id = state->get_connection_id(state);
if (find_connection(this, conn_id))
@@ -550,7 +550,7 @@ METHOD(imc_agent_t, destroy, void,
* Described in header.
*/
imc_agent_t *imc_agent_create(const char *name,
pen_type_t *supported_types, u_int32_t type_count,
pen_type_t *supported_types, uint32_t type_count,
TNC_IMCID id, TNC_Version *actual_version)
{
private_imc_agent_t *this;
src/libimcv/imc/imc_agent.h
+1 -1
View File
@@ -198,7 +198,7 @@ struct imc_agent_t {
*
*/
imc_agent_t *imc_agent_create(const char *name,
pen_type_t *supported_types, u_int32_t type_count,
pen_type_t *supported_types, uint32_t type_count,
TNC_IMCID id, TNC_Version *actual_version);
#endif /** IMC_AGENT_H_ @}*/
src/libimcv/imc/imc_os_info.c
+1 -1
View File
@@ -69,7 +69,7 @@ METHOD(imc_os_info_t, get_name, chunk_t,
}
METHOD(imc_os_info_t, get_numeric_version, void,
private_imc_os_info_t *this, u_int32_t *major, u_int32_t *minor)
private_imc_os_info_t *this, uint32_t *major, uint32_t *minor)
{
u_char *pos;
src/libimcv/imc/imc_os_info.h
+2 -2
View File
@@ -54,8 +54,8 @@ struct imc_os_info_t {
* @param major OS major version number
* @param minor OS minor version number
*/
void (*get_numeric_version)(imc_os_info_t *this, u_int32_t *major,
u_int32_t *minor);
void (*get_numeric_version)(imc_os_info_t *this, uint32_t *major,
uint32_t *minor);
/**
* Get the OS version or release
src/libimcv/imc/imc_state.h
+2 -2
View File
@@ -72,14 +72,14 @@ struct imc_state_t {
*
* @param max_msg_len maximum size of a PA-TNC message
*/
void (*set_max_msg_len)(imc_state_t *this, u_int32_t max_msg_len);
void (*set_max_msg_len)(imc_state_t *this, uint32_t max_msg_len);
/**
* Get the maximum size of a PA-TNC message for this TNCCS connection
*
* @return maximum size of a PA-TNC message
*/
u_int32_t (*get_max_msg_len)(imc_state_t *this);
uint32_t (*get_max_msg_len)(imc_state_t *this);
/**
* Get attribute segmentation contracts associated with TNCCS Connection
src/libimcv/imv/imv_database.h
+1 -1
View File
@@ -46,7 +46,7 @@ struct imv_database_t {
*/
imv_session_t* (*add_session)(imv_database_t *this,
TNC_ConnectionID conn_id,
u_int32_t ar_id_type, chunk_t ar_id_value);
uint32_t ar_id_type, chunk_t ar_id_value);
/**
* Remove and delete a session
src/libimcv/ita/ita_attr.c
+1 -1
View File
@@ -35,7 +35,7 @@ ENUM(ita_attr_names, ITA_ATTR_COMMAND, ITA_ATTR_DEVICE_ID,
/**
* See header
*/
pa_tnc_attr_t* ita_attr_create_from_data(u_int32_t type, size_t length,
pa_tnc_attr_t* ita_attr_create_from_data(uint32_t type, size_t length,
chunk_t value)
{
switch (type)
src/libimcv/ita/ita_attr.h
+1 -1
View File
@@ -53,7 +53,7 @@ extern enum_name_t *ita_attr_names;
* @param length attribute length
* @param value attribute value or segment
*/
pa_tnc_attr_t* ita_attr_create_from_data(u_int32_t type, size_t length,
pa_tnc_attr_t* ita_attr_create_from_data(uint32_t type, size_t length,
chunk_t value);
#endif /** ITA_ATTR_H_ @}*/
src/libimcv/ita/ita_attr_angel.c
+1 -1
View File
@@ -81,7 +81,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ita_attr_angel_t *this, u_int32_t *offset)
private_ita_attr_angel_t *this, uint32_t *offset)
{
return SUCCESS;
}
src/libimcv/ita/ita_attr_command.c
+1 -1
View File
@@ -101,7 +101,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ita_attr_command_t *this, u_int32_t *offset)
private_ita_attr_command_t *this, uint32_t *offset)
{
*offset = 0;
src/libimcv/ita/ita_attr_dummy.c
+1 -1
View File
@@ -99,7 +99,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ita_attr_dummy_t *this, u_int32_t *offset)
private_ita_attr_dummy_t *this, uint32_t *offset)
{
*offset = 0;
src/libimcv/ita/ita_attr_get_settings.c
+2 -2
View File
@@ -140,10 +140,10 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ita_attr_get_settings_t *this, u_int32_t *offset)
private_ita_attr_get_settings_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int32_t count;
uint32_t count;
chunk_t name;
status_t status = FAILED;
src/libimcv/ita/ita_attr_settings.c
+2 -2
View File
@@ -169,10 +169,10 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_ita_attr_settings_t *this, u_int32_t *offset)
private_ita_attr_settings_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int32_t count;
uint32_t count;
chunk_t name, value;
entry_t *entry;
status_t status = FAILED;
src/libimcv/pa_tnc/pa_tnc_attr_manager.h
+1 -1
View File
@@ -28,7 +28,7 @@ typedef struct pa_tnc_attr_manager_t pa_tnc_attr_manager_t;
#include <library.h>
#include <bio/bio_reader.h>
typedef pa_tnc_attr_t* (*pa_tnc_attr_create_t)(u_int32_t type, size_t length,
typedef pa_tnc_attr_t* (*pa_tnc_attr_create_t)(uint32_t type, size_t length,
chunk_t value);
/**
src/libimcv/plugins/imc_attestation/imc_attestation_process.c
+5 -5
View File
@@ -225,9 +225,9 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, imc_msg_t *msg,
{
tcg_pts_attr_req_file_meas_t *attr_cast;
char *pathname;
u_int16_t request_id;
uint16_t request_id;
bool is_directory;
u_int32_t delimiter;
uint32_t delimiter;
pts_file_meas_t *measurements;
pen_type_t error_code;
@@ -282,7 +282,7 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, imc_msg_t *msg,
tcg_pts_attr_req_file_meta_t *attr_cast;
char *pathname;
bool is_directory;
u_int8_t delimiter;
uint8_t delimiter;
pts_file_meta_t *metadata;
pen_type_t error_code;
@@ -336,8 +336,8 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, imc_msg_t *msg,
pts_comp_evidence_t *evid;
pts_component_t *comp;
pen_type_t error_code;
u_int32_t depth;
u_int8_t flags;
uint32_t depth;
uint8_t flags;
status_t status;
enumerator_t *e;
src/libimcv/plugins/imc_attestation/imc_attestation_state.c
+4 -4
View File
@@ -64,7 +64,7 @@ struct private_imc_attestation_state_t {
/**
* Maximum PA-TNC message size for this TNCCS connection
*/
u_int32_t max_msg_len;
uint32_t max_msg_len;
/**
* PA-TNC attribute segmentation contracts associated with TNCCS connection
@@ -114,12 +114,12 @@ METHOD(imc_state_t, set_flags, void,
}
METHOD(imc_state_t, set_max_msg_len, void,
private_imc_attestation_state_t *this, u_int32_t max_msg_len)
private_imc_attestation_state_t *this, uint32_t max_msg_len)
{
this->max_msg_len = max_msg_len;
}
METHOD(imc_state_t, get_max_msg_len, u_int32_t,
METHOD(imc_state_t, get_max_msg_len, uint32_t,
private_imc_attestation_state_t *this)
{
return this->max_msg_len;
@@ -175,7 +175,7 @@ METHOD(imc_attestation_state_t, get_pts, pts_t*,
METHOD(imc_attestation_state_t, create_component, pts_component_t*,
private_imc_attestation_state_t *this, pts_comp_func_name_t *name,
u_int32_t depth)
uint32_t depth)
{
enumerator_t *enumerator;
pts_component_t *component;
src/libimcv/plugins/imc_attestation/imc_attestation_state.h
+1 -1
View File
@@ -57,7 +57,7 @@ struct imc_attestation_state_t {
* @return created functional component instance or NULL
*/
pts_component_t* (*create_component)(imc_attestation_state_t *this,
pts_comp_func_name_t *name, u_int32_t depth);
pts_comp_func_name_t *name, uint32_t depth);
/**
* Add an entry to the Component Evidence cache list
src/libimcv/plugins/imc_hcd/imc_hcd_state.c
+3 -3
View File
@@ -59,7 +59,7 @@ struct private_imc_hcd_state_t {
/**
* Maximum PA-TNC message size for this TNCCS connection
*/
u_int32_t max_msg_len;
uint32_t max_msg_len;
/**
* PA-TNC attribute segmentation contracts associated with TNCCS connection
@@ -93,12 +93,12 @@ METHOD(imc_state_t, set_flags, void,
}
METHOD(imc_state_t, set_max_msg_len, void,
private_imc_hcd_state_t *this, u_int32_t max_msg_len)
private_imc_hcd_state_t *this, uint32_t max_msg_len)
{
this->max_msg_len = max_msg_len;
}
METHOD(imc_state_t, get_max_msg_len, u_int32_t,
METHOD(imc_state_t, get_max_msg_len, uint32_t,
private_imc_hcd_state_t *this)
{
return this->max_msg_len;
src/libimcv/plugins/imc_os/imc_os.c
+1 -1
View File
@@ -162,7 +162,7 @@ static void add_product_info(imc_msg_t *msg)
static void add_numeric_version(imc_msg_t *msg)
{
pa_tnc_attr_t *attr;
u_int32_t major, minor;
uint32_t major, minor;
os->get_numeric_version(os, &major, &minor);
DBG1(DBG_IMC, "operating system numeric version is %d.%d",
src/libimcv/plugins/imc_os/imc_os_state.c
+3 -3
View File
@@ -59,7 +59,7 @@ struct private_imc_os_state_t {
/**
* Maximum PA-TNC message size for this TNCCS connection
*/
u_int32_t max_msg_len;
uint32_t max_msg_len;
/**
* PA-TNC attribute segmentation contracts associated with TNCCS connection
@@ -93,12 +93,12 @@ METHOD(imc_state_t, set_flags, void,
}
METHOD(imc_state_t, set_max_msg_len, void,
private_imc_os_state_t *this, u_int32_t max_msg_len)
private_imc_os_state_t *this, uint32_t max_msg_len)
{
this->max_msg_len = max_msg_len;
}
METHOD(imc_state_t, get_max_msg_len, u_int32_t,
METHOD(imc_state_t, get_max_msg_len, uint32_t,
private_imc_os_state_t *this)
{
return this->max_msg_len;
src/libimcv/plugins/imc_scanner/imc_scanner.c
+2 -2
View File
@@ -128,8 +128,8 @@ static bool do_netstat(ietf_attr_port_filter_t *attr)
while (fgets(buf, sizeof(buf), file))
{
u_char *pos;
u_int8_t new_protocol, protocol;
u_int16_t new_port, port;
uint8_t new_protocol, protocol;
uint16_t new_port, port;
int i;
enumerator_t *enumerator;
bool allowed, found = FALSE;
src/libimcv/plugins/imc_scanner/imc_scanner_state.c
+3 -3
View File
@@ -59,7 +59,7 @@ struct private_imc_scanner_state_t {
/**
* Maximum PA-TNC message size for this TNCCS connection
*/
u_int32_t max_msg_len;
uint32_t max_msg_len;
/**
* PA-TNC attribute segmentation contracts associated with TNCCS connection
@@ -93,12 +93,12 @@ METHOD(imc_state_t, set_flags, void,
}
METHOD(imc_state_t, set_max_msg_len, void,
private_imc_scanner_state_t *this, u_int32_t max_msg_len)
private_imc_scanner_state_t *this, uint32_t max_msg_len)
{
this->max_msg_len = max_msg_len;
}
METHOD(imc_state_t, get_max_msg_len, u_int32_t,
METHOD(imc_state_t, get_max_msg_len, uint32_t,
private_imc_scanner_state_t *this)
{
return this->max_msg_len;
src/libimcv/plugins/imc_swid/imc_swid_state.c
+7 -7
View File
@@ -59,7 +59,7 @@ struct private_imc_swid_state_t {
/**
* Maximum PA-TNC message size for this TNCCS connection
*/
u_int32_t max_msg_len;
uint32_t max_msg_len;
/**
* PA-TNC attribute segmentation contracts associated with TNCCS connection
@@ -69,7 +69,7 @@ struct private_imc_swid_state_t {
/**
* Event ID Epoch
*/
u_int32_t eid_epoch;
uint32_t eid_epoch;
};
METHOD(imc_state_t, get_connection_id, TNC_ConnectionID,
@@ -98,12 +98,12 @@ METHOD(imc_state_t, set_flags, void,
}
METHOD(imc_state_t, set_max_msg_len, void,
private_imc_swid_state_t *this, u_int32_t max_msg_len)
private_imc_swid_state_t *this, uint32_t max_msg_len)
{
this->max_msg_len = max_msg_len;
}
METHOD(imc_state_t, get_max_msg_len, u_int32_t,
METHOD(imc_state_t, get_max_msg_len, uint32_t,
private_imc_swid_state_t *this)
{
return this->max_msg_len;
@@ -146,7 +146,7 @@ METHOD(imc_state_t, destroy, void,
free(this);
}
METHOD(imc_swid_state_t, get_eid_epoch, u_int32_t,
METHOD(imc_swid_state_t, get_eid_epoch, uint32_t,
private_imc_swid_state_t *this)
{
return this->eid_epoch;
@@ -158,11 +158,11 @@ METHOD(imc_swid_state_t, get_eid_epoch, u_int32_t,
imc_state_t *imc_swid_state_create(TNC_ConnectionID connection_id)
{
private_imc_swid_state_t *this;
u_int32_t eid_epoch;
uint32_t eid_epoch;
nonce_gen_t *ng;
ng = lib->crypto->create_nonce_gen(lib->crypto);
if (!ng || !ng->get_nonce(ng, 4, (u_int8_t*)&eid_epoch))
if (!ng || !ng->get_nonce(ng, 4, (uint8_t*)&eid_epoch))
{
DBG1(DBG_TNC, "failed to generate random EID epoch value");
DESTROY_IF(ng);
src/libimcv/plugins/imc_swid/imc_swid_state.h
+1 -1
View File
@@ -43,7 +43,7 @@ struct imc_swid_state_t {
*
* @return Event ID Epoch
*/
u_int32_t (*get_eid_epoch)(imc_swid_state_t *this);
uint32_t (*get_eid_epoch)(imc_swid_state_t *this);
};
src/libimcv/plugins/imc_test/imc_test_state.c
+3 -3
View File
@@ -61,7 +61,7 @@ struct private_imc_test_state_t {
/**
* Maximum PA-TNC message size for this TNCCS connection
*/
u_int32_t max_msg_len;
uint32_t max_msg_len;
/**
* PA-TNC attribute segmentation contracts associated with TNCCS connection
@@ -124,12 +124,12 @@ METHOD(imc_state_t, set_flags, void,
}
METHOD(imc_state_t, set_max_msg_len, void,
private_imc_test_state_t *this, u_int32_t max_msg_len)
private_imc_test_state_t *this, uint32_t max_msg_len)
{
this->max_msg_len = max_msg_len;
}
METHOD(imc_state_t, get_max_msg_len, u_int32_t,
METHOD(imc_state_t, get_max_msg_len, uint32_t,
private_imc_test_state_t *this)
{
return this->max_msg_len;
src/libimcv/plugins/imv_attestation/attest_db.c
+1 -1
View File
@@ -853,7 +853,7 @@ METHOD(attest_db_t, list_devices, void,
time_t timestamp;
int id, last_id = 0, ar_id = 0, last_ar_id = 0, device_count = 0, trusted;
int session_id, rec;
u_int32_t ar_id_type;
uint32_t ar_id_type;
u_int tstamp;
e = this->db->query(this->db,
src/libimcv/plugins/imv_scanner/imv_scanner_agent.c
+4 -4
View File
@@ -185,13 +185,13 @@ METHOD(imv_agent_if_t, receive_message_long, TNC_Result,
typedef struct port_range_t port_range_t;
struct port_range_t {
u_int16_t start, stop;
uint16_t start, stop;
};
/**
* Parse a TCP or UDP port list from an argument string
*/
static linked_list_t* get_port_list(u_int8_t protocol_family,
static linked_list_t* get_port_list(uint8_t protocol_family,
bool closed_port_policy, char *arg_str)
{
chunk_t port_list, port_item, port_start;
@@ -336,8 +336,8 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
{
TNC_IMV_Evaluation_Result eval;
TNC_IMV_Action_Recommendation rec;
u_int8_t protocol_family, protocol;
u_int16_t port;
uint8_t protocol_family, protocol;
uint16_t port;
bool closed_port_policy, blocked, first;
char result_str[BUF_LEN], *pos, *protocol_str;
size_t len;
src/libimcv/pts/components/ita/ita_comp_ima.h
+1 -1
View File
@@ -29,7 +29,7 @@
* @param depth Sub-component depth
* @param pts_db PTS measurement database
*/
pts_component_t* pts_ita_comp_ima_create(u_int32_t depth,
pts_component_t* pts_ita_comp_ima_create(uint32_t depth,
pts_database_t *pts_db);
#endif /** PTS_ITA_COMP_IMA_H_ @}*/
src/libimcv/pts/components/ita/ita_comp_tboot.c
+10 -10
View File
@@ -43,7 +43,7 @@ struct pts_ita_comp_tboot_t {
/**
* Sub-component depth
*/
u_int32_t depth;
uint32_t depth;
/**
* PTS measurement database
@@ -93,20 +93,20 @@ METHOD(pts_component_t, get_comp_func_name, pts_comp_func_name_t*,
return this->name;
}
METHOD(pts_component_t, get_evidence_flags, u_int8_t,
METHOD(pts_component_t, get_evidence_flags, uint8_t,
pts_ita_comp_tboot_t *this)
{
return PTS_REQ_FUNC_COMP_EVID_PCR;
}
METHOD(pts_component_t, get_depth, u_int32_t,
METHOD(pts_component_t, get_depth, uint32_t,
pts_ita_comp_tboot_t *this)
{
return this->depth;
}
METHOD(pts_component_t, measure, status_t,
pts_ita_comp_tboot_t *this, u_int8_t qualifier, pts_t *pts,
pts_ita_comp_tboot_t *this, uint8_t qualifier, pts_t *pts,
pts_comp_evidence_t **evidence)
{
@@ -117,7 +117,7 @@ METHOD(pts_component_t, measure, status_t,
pts_comp_evidence_t *evid;
char *meas_hex, *pcr_before_hex, *pcr_after_hex;
chunk_t measurement, pcr_before, pcr_after;
u_int32_t extended_pcr;
uint32_t extended_pcr;
switch (this->seq_no++)
{
@@ -183,11 +183,11 @@ METHOD(pts_component_t, measure, status_t,
}
METHOD(pts_component_t, verify, status_t,
pts_ita_comp_tboot_t *this, u_int8_t qualifier,pts_t *pts,
pts_ita_comp_tboot_t *this, uint8_t qualifier,pts_t *pts,
pts_comp_evidence_t *evidence)
{
bool has_pcr_info;
u_int32_t extended_pcr, vid, name;
uint32_t extended_pcr, vid, name;
enum_name_t *names;
pts_meas_algorithms_t algo;
pts_pcr_transform_t transform;
@@ -264,7 +264,7 @@ METHOD(pts_component_t, verify, status_t,
}
METHOD(pts_component_t, finalize, bool,
pts_ita_comp_tboot_t *this, u_int8_t qualifier, bio_writer_t *result)
pts_ita_comp_tboot_t *this, uint8_t qualifier, bio_writer_t *result)
{
char result_buf[BUF_LEN];
@@ -304,7 +304,7 @@ METHOD(pts_component_t, destroy, void,
pts_ita_comp_tboot_t *this)
{
int count;
u_int32_t vid, name;
uint32_t vid, name;
enum_name_t *names;
if (ref_put(&this->ref))
@@ -328,7 +328,7 @@ METHOD(pts_component_t, destroy, void,
/**
* See header
*/
pts_component_t *pts_ita_comp_tboot_create(u_int32_t depth,
pts_component_t *pts_ita_comp_tboot_create(uint32_t depth,
pts_database_t *pts_db)
{
pts_ita_comp_tboot_t *this;
src/libimcv/pts/components/ita/ita_comp_tboot.h
+1 -1
View File
@@ -29,7 +29,7 @@
* @param depth Sub-component depth
* @param pts_db PTS measurement database
*/
pts_component_t* pts_ita_comp_tboot_create(u_int32_t depth,
pts_component_t* pts_ita_comp_tboot_create(uint32_t depth,
pts_database_t *pts_db);
#endif /** PTS_ITA_COMP_TBOOT_H_ @}*/
src/libimcv/pts/components/ita/ita_comp_tgrub.c
+9 -9
View File
@@ -42,7 +42,7 @@ struct pts_ita_comp_tgrub_t {
/**
* Sub-component depth
*/
u_int32_t depth;
uint32_t depth;
/**
* PTS measurement database
@@ -62,27 +62,27 @@ METHOD(pts_component_t, get_comp_func_name, pts_comp_func_name_t*,
return this->name;
}
METHOD(pts_component_t, get_evidence_flags, u_int8_t,
METHOD(pts_component_t, get_evidence_flags, uint8_t,
pts_ita_comp_tgrub_t *this)
{
return PTS_REQ_FUNC_COMP_EVID_PCR;
}
METHOD(pts_component_t, get_depth, u_int32_t,
METHOD(pts_component_t, get_depth, uint32_t,
pts_ita_comp_tgrub_t *this)
{
return this->depth;
}
METHOD(pts_component_t, measure, status_t,
pts_ita_comp_tgrub_t *this, u_int8_t qualifier, pts_t *pts,
pts_ita_comp_tgrub_t *this, uint8_t qualifier, pts_t *pts,
pts_comp_evidence_t **evidence)
{
size_t pcr_len;
pts_pcr_transform_t pcr_transform;
pts_meas_algorithms_t hash_algo;
pts_comp_evidence_t *evid;
u_int32_t extended_pcr;
uint32_t extended_pcr;
time_t measurement_time;
chunk_t measurement, pcr_before, pcr_after;
@@ -116,11 +116,11 @@ METHOD(pts_component_t, measure, status_t,
}
METHOD(pts_component_t, verify, status_t,
pts_ita_comp_tgrub_t *this, u_int8_t qualifier, pts_t *pts,
pts_ita_comp_tgrub_t *this, uint8_t qualifier, pts_t *pts,
pts_comp_evidence_t *evidence)
{
bool has_pcr_info;
u_int32_t extended_pcr;
uint32_t extended_pcr;
pts_meas_algorithms_t algo;
pts_pcr_transform_t transform;
pts_pcr_t *pcrs;
@@ -155,7 +155,7 @@ METHOD(pts_component_t, verify, status_t,
}
METHOD(pts_component_t, finalize, bool,
pts_ita_comp_tgrub_t *this, u_int8_t qualifier, bio_writer_t *result)
pts_ita_comp_tgrub_t *this, uint8_t qualifier, bio_writer_t *result)
{
return FALSE;
}
@@ -180,7 +180,7 @@ METHOD(pts_component_t, destroy, void,
/**
* See header
*/
pts_component_t *pts_ita_comp_tgrub_create(u_int32_t depth,
pts_component_t *pts_ita_comp_tgrub_create(uint32_t depth,
pts_database_t *pts_db)
{
pts_ita_comp_tgrub_t *this;
src/libimcv/pts/components/ita/ita_comp_tgrub.h
+1 -1
View File
@@ -29,7 +29,7 @@
* @param depth Sub-component depth
* @param pts_db PTS measurement database
*/
pts_component_t* pts_ita_comp_tgrub_create(u_int32_t depth,
pts_component_t* pts_ita_comp_tgrub_create(uint32_t depth,
pts_database_t *pts_db);
#endif /** PTS_ITA_COMP_TGRUB_H_ @}*/
src/libimcv/pts/components/pts_comp_evidence.c
+7 -7
View File
@@ -37,7 +37,7 @@ struct private_pts_comp_evidence_t {
/**
* Sub-Component Depth
*/
u_int32_t depth;
uint32_t depth;
/**
* Measurement Time
@@ -62,7 +62,7 @@ struct private_pts_comp_evidence_t {
/**
* PCR the measurement was extended into
*/
u_int32_t extended_pcr;
uint32_t extended_pcr;
/**
* PCR value before extension
@@ -92,7 +92,7 @@ struct private_pts_comp_evidence_t {
};
METHOD(pts_comp_evidence_t, get_comp_func_name, pts_comp_func_name_t*,
private_pts_comp_evidence_t *this, u_int32_t *depth)
private_pts_comp_evidence_t *this, uint32_t *depth)
{
if (depth)
{
@@ -101,14 +101,14 @@ METHOD(pts_comp_evidence_t, get_comp_func_name, pts_comp_func_name_t*,
return this->name;
}
METHOD(pts_comp_evidence_t, get_extended_pcr, u_int32_t,
METHOD(pts_comp_evidence_t, get_extended_pcr, uint32_t,
private_pts_comp_evidence_t *this)
{
return this->extended_pcr;
}
METHOD(pts_comp_evidence_t, get_measurement, chunk_t,
private_pts_comp_evidence_t *this, u_int32_t *extended_pcr,
private_pts_comp_evidence_t *this, uint32_t *extended_pcr,
pts_meas_algorithms_t *algo, pts_pcr_transform_t *transform,
time_t *measurement_time)
{
@@ -193,8 +193,8 @@ METHOD(pts_comp_evidence_t, destroy, void,
* See header
*/
pts_comp_evidence_t *pts_comp_evidence_create(pts_comp_func_name_t *name,
u_int32_t depth,
u_int32_t extended_pcr,
uint32_t depth,
uint32_t extended_pcr,
pts_meas_algorithms_t algo,
pts_pcr_transform_t transform,
time_t measurement_time,
src/libimcv/pts/components/pts_comp_evidence.h
+5 -5
View File
@@ -70,14 +70,14 @@ struct pts_comp_evidence_t {
* @result Component Functional Name
*/
pts_comp_func_name_t* (*get_comp_func_name)(pts_comp_evidence_t *this,
u_int32_t *depth);
uint32_t *depth);
/**
* Gets the PCR the measurement was extended into
*
* @result PCR the measurement was extended into
*/
u_int32_t (*get_extended_pcr)(pts_comp_evidence_t *this);
uint32_t (*get_extended_pcr)(pts_comp_evidence_t *this);
/**
* Gets the measurement and the algorithms used
@@ -89,7 +89,7 @@ struct pts_comp_evidence_t {
* @result Measurement hash value
*/
chunk_t (*get_measurement)(pts_comp_evidence_t *this,
u_int32_t *extended_pcr,
uint32_t *extended_pcr,
pts_meas_algorithms_t *algo,
pts_pcr_transform_t *transform,
time_t *measurement_time);
@@ -150,8 +150,8 @@ struct pts_comp_evidence_t {
* @param measurement Measurement hash value
*/
pts_comp_evidence_t* pts_comp_evidence_create(pts_comp_func_name_t *name,
u_int32_t depth,
u_int32_t extended_pcr,
uint32_t depth,
uint32_t extended_pcr,
pts_meas_algorithms_t algo,
pts_pcr_transform_t transform,
time_t measurement_time,
src/libimcv/pts/components/pts_comp_func_name.c
+9 -9
View File
@@ -35,40 +35,40 @@ struct private_pts_comp_func_name_t {
/**
* PTS Component Functional Name Vendor ID
*/
u_int32_t vid;
uint32_t vid;
/**
* PTS Component Functional Name
*/
u_int32_t name;
uint32_t name;
/**
* PTS Component Functional Name Qualifier
*/
u_int8_t qualifier;
uint8_t qualifier;
};
METHOD(pts_comp_func_name_t, get_vendor_id, u_int32_t,
METHOD(pts_comp_func_name_t, get_vendor_id, uint32_t,
private_pts_comp_func_name_t *this)
{
return this->vid;
}
METHOD(pts_comp_func_name_t, get_name, u_int32_t,
METHOD(pts_comp_func_name_t, get_name, uint32_t,
private_pts_comp_func_name_t *this)
{
return this->name;
}
METHOD(pts_comp_func_name_t, get_qualifier, u_int8_t,
METHOD(pts_comp_func_name_t, get_qualifier, uint8_t,
private_pts_comp_func_name_t *this)
{
return this->qualifier;
}
METHOD(pts_comp_func_name_t, set_qualifier, void,
private_pts_comp_func_name_t *this, u_int8_t qualifier)
private_pts_comp_func_name_t *this, uint8_t qualifier)
{
this->qualifier = qualifier;
}
@@ -136,8 +136,8 @@ METHOD(pts_comp_func_name_t, destroy, void,
/**
* See header
*/
pts_comp_func_name_t* pts_comp_func_name_create(u_int32_t vid, u_int32_t name,
u_int8_t qualifier)
pts_comp_func_name_t* pts_comp_func_name_create(uint32_t vid, uint32_t name,
uint8_t qualifier)
{
private_pts_comp_func_name_t *this;
src/libimcv/pts/components/pts_comp_func_name.h
+6 -6
View File
@@ -38,28 +38,28 @@ struct pts_comp_func_name_t {
*
* @return PTS Component Functional Name Vendor ID
*/
u_int32_t (*get_vendor_id)(pts_comp_func_name_t *this);
uint32_t (*get_vendor_id)(pts_comp_func_name_t *this);
/**
* Get the PTS Component Functional Name
*
* @return PTS Component Functional Name
*/
u_int32_t (*get_name)(pts_comp_func_name_t *this);
uint32_t (*get_name)(pts_comp_func_name_t *this);
/**
* Get the PTS Component Functional Name Qualifier
*
* @return PTS Component Functional Name Qualifier
*/
u_int8_t (*get_qualifier)(pts_comp_func_name_t *this);
uint8_t (*get_qualifier)(pts_comp_func_name_t *this);
/**
* Set the PTS Component Functional Name Qualifier
*
* @param qualifier PTS Component Functional Name Qualifier to be set
*/
void (*set_qualifier)(pts_comp_func_name_t *this, u_int8_t qualifier);
void (*set_qualifier)(pts_comp_func_name_t *this, uint8_t qualifier);
/**
* Check to PTS Component Functional Names for equality
@@ -97,7 +97,7 @@ struct pts_comp_func_name_t {
* @param name PTS Component Functional Name
* @param qualifier PTS Component Functional Name Qualifier
*/
pts_comp_func_name_t* pts_comp_func_name_create(u_int32_t vid, u_int32_t name,
u_int8_t qualifier);
pts_comp_func_name_t* pts_comp_func_name_create(uint32_t vid, uint32_t name,
uint8_t qualifier);
#endif /** PTS_FUNC_COMP_NAME_H_ @}*/
src/libimcv/pts/components/pts_component.h
+5 -5
View File
@@ -49,14 +49,14 @@ struct pts_component_t {
*
* @return PTS Component Functional Name
*/
u_int8_t (*get_evidence_flags)(pts_component_t *this);
uint8_t (*get_evidence_flags)(pts_component_t *this);
/**
* Get the PTS Sub-component Depth
*
* @return PTS Sub-component Depth
*/
u_int32_t (*get_depth)(pts_component_t *this);
uint32_t (*get_depth)(pts_component_t *this);
/**
* Do evidence measurements on the PTS Functional Component
@@ -67,7 +67,7 @@ struct pts_component_t {
* @param measurements additional file measurements (NULL if not present)
* @return status return code
*/
status_t (*measure)(pts_component_t *this, u_int8_t qualifier, pts_t *pts,
status_t (*measure)(pts_component_t *this, uint8_t qualifier, pts_t *pts,
pts_comp_evidence_t** evidence);
/**
@@ -78,7 +78,7 @@ struct pts_component_t {
* @param evidence component evidence measurement to be verified
* @return status return code
*/
status_t (*verify)(pts_component_t *this, u_int8_t qualifier, pts_t *pts,
status_t (*verify)(pts_component_t *this, uint8_t qualifier, pts_t *pts,
pts_comp_evidence_t *evidence);
/**
@@ -89,7 +89,7 @@ struct pts_component_t {
* @param result writer appending concise measurement result
* @return TRUE if finalization successful
*/
bool (*finalize)(pts_component_t *this, u_int8_t qualifier,
bool (*finalize)(pts_component_t *this, uint8_t qualifier,
bio_writer_t *result);
/**
src/libimcv/pts/components/pts_component_manager.c
+5 -5
View File
@@ -77,7 +77,7 @@ struct component_entry_t {
/**
* Vendor-Specific Component Functional Name
*/
u_int32_t name;
uint32_t name;
/**
* Functional Component creation method
@@ -165,7 +165,7 @@ METHOD(pts_component_manager_t, get_qualifier_type_names, enum_name_t*,
}
METHOD(pts_component_manager_t, add_component, void,
private_pts_component_manager_t *this, pen_t vendor_id, u_int32_t name,
private_pts_component_manager_t *this, pen_t vendor_id, uint32_t name,
pts_component_create_t create)
{
enumerator_t *enumerator;
@@ -210,13 +210,13 @@ METHOD(pts_component_manager_t, remove_vendor, void,
enumerator->destroy(enumerator);
}
METHOD(pts_component_manager_t, get_qualifier, u_int8_t,
METHOD(pts_component_manager_t, get_qualifier, uint8_t,
private_pts_component_manager_t *this, pts_comp_func_name_t *name,
char *flags)
{
enumerator_t *enumerator;
vendor_entry_t *entry;
u_int8_t qualifier, size, flag, type = 0;
uint8_t qualifier, size, flag, type = 0;
int i;
enumerator = this->list->create_enumerator(this->list);
@@ -252,7 +252,7 @@ METHOD(pts_component_manager_t, get_qualifier, u_int8_t,
METHOD(pts_component_manager_t, create, pts_component_t*,
private_pts_component_manager_t *this,
pts_comp_func_name_t *name, u_int32_t depth, pts_database_t *pts_db)
pts_comp_func_name_t *name, uint32_t depth, pts_database_t *pts_db)
{
enumerator_t *enumerator, *e2;
vendor_entry_t *entry;
src/libimcv/pts/components/pts_component_manager.h
+4 -4
View File
@@ -30,7 +30,7 @@ typedef struct pts_component_manager_t pts_component_manager_t;
#include <library.h>
#include <pen/pen.h>
typedef pts_component_t* (*pts_component_create_t)(u_int32_t depth,
typedef pts_component_t* (*pts_component_create_t)(uint32_t depth,
pts_database_t *pts_db);
/**
@@ -61,7 +61,7 @@ struct pts_component_manager_t {
* @param create Functional Component creation method
*/
void (*add_component)(pts_component_manager_t *this, pen_t vendor_id,
u_int32_t name, pts_component_create_t create);
uint32_t name, pts_component_create_t create);
/**
* Remove vendor-specific components and associated namespace
@@ -95,7 +95,7 @@ struct pts_component_manager_t {
* @param flags Qualifier Flags as a string in a char buffer
* @return Qualifier Type
*/
u_int8_t (*get_qualifier)(pts_component_manager_t *this,
uint8_t (*get_qualifier)(pts_component_manager_t *this,
pts_comp_func_name_t *name, char *flags);
/**
@@ -107,7 +107,7 @@ struct pts_component_manager_t {
* @return Component object if supported, NULL else
*/
pts_component_t* (*create)(pts_component_manager_t *this,
pts_comp_func_name_t *name, u_int32_t depth,
pts_comp_func_name_t *name, uint32_t depth,
pts_database_t *pts_db);
/**
src/libimcv/pts/pts.c
+7 -7
View File
@@ -615,7 +615,7 @@ METHOD(pts_t, get_metadata, pts_file_meta_t*,
#ifdef TSS_TROUSERS
METHOD(pts_t, read_pcr, bool,
private_pts_t *this, u_int32_t pcr_num, chunk_t *pcr_value)
private_pts_t *this, uint32_t pcr_num, chunk_t *pcr_value)
{
TSS_HCONTEXT hContext;
TSS_HTPM hTPM;
@@ -663,12 +663,12 @@ err:
}
METHOD(pts_t, extend_pcr, bool,
private_pts_t *this, u_int32_t pcr_num, chunk_t input, chunk_t *output)
private_pts_t *this, uint32_t pcr_num, chunk_t input, chunk_t *output)
{
TSS_HCONTEXT hContext;
TSS_HTPM hTPM;
TSS_RESULT result;
u_int32_t pcr_length;
uint32_t pcr_length;
chunk_t pcr_value = chunk_empty;
result = Tspi_Context_Create(&hContext);
@@ -734,7 +734,7 @@ METHOD(pts_t, quote_tpm, bool,
TSS_RESULT result;
chunk_t quote_info;
BYTE* versionInfo;
u_int32_t versionInfoSize, pcr;
uint32_t versionInfoSize, pcr;
enumerator_t *enumerator;
bool success = FALSE;
@@ -876,13 +876,13 @@ err1:
#else /* TSS_TROUSERS */
METHOD(pts_t, read_pcr, bool,
private_pts_t *this, u_int32_t pcr_num, chunk_t *pcr_value)
private_pts_t *this, uint32_t pcr_num, chunk_t *pcr_value)
{
return FALSE;
}
METHOD(pts_t, extend_pcr, bool,
private_pts_t *this, u_int32_t pcr_num, chunk_t input, chunk_t *output)
private_pts_t *this, uint32_t pcr_num, chunk_t input, chunk_t *output)
{
return FALSE;
}
@@ -1086,7 +1086,7 @@ static bool has_tpm(private_pts_t *this)
TSS_HCONTEXT hContext;
TSS_HTPM hTPM;
TSS_RESULT result;
u_int32_t version_info_len;
uint32_t version_info_len;
result = Tspi_Context_Create(&hContext);
if (result != TSS_SUCCESS)
src/libimcv/pts/pts.h
+2 -2
View File
@@ -243,7 +243,7 @@ struct pts_t {
* @param pcr_value Chunk to save pcr read output
* @return NULL in case of TSS error, PCR value otherwise
*/
bool (*read_pcr)(pts_t *this, u_int32_t pcr_num, chunk_t *pcr_value);
bool (*read_pcr)(pts_t *this, uint32_t pcr_num, chunk_t *pcr_value);
/**
* Extends given PCR with given value
@@ -254,7 +254,7 @@ struct pts_t {
* @param output Chunk to save PCR value after extension
* @return FALSE in case of TSS error, TRUE otherwise
*/
bool (*extend_pcr)(pts_t *this, u_int32_t pcr_num, chunk_t input,
bool (*extend_pcr)(pts_t *this, uint32_t pcr_num, chunk_t input,
chunk_t *output);
/**
src/libimcv/pts/pts_file_meas.c
+4 -4
View File
@@ -39,7 +39,7 @@ struct private_pts_file_meas_t {
/**
* ID of PTS File Measurement Request
*/
u_int16_t request_id;
uint16_t request_id;
/**
* List of File Measurements
@@ -70,7 +70,7 @@ static void free_entry(entry_t *entry)
}
}
METHOD(pts_file_meas_t, get_request_id, u_int16_t,
METHOD(pts_file_meas_t, get_request_id, uint16_t,
private_pts_file_meas_t *this)
{
return this->request_id;
@@ -266,7 +266,7 @@ METHOD(pts_file_meas_t, destroy, void,
/**
* See header
*/
pts_file_meas_t *pts_file_meas_create(u_int16_t request_id)
pts_file_meas_t *pts_file_meas_create(uint16_t request_id)
{
private_pts_file_meas_t *this;
@@ -334,7 +334,7 @@ static bool hash_file(hasher_t *hasher, char *pathname, u_char *hash)
/**
* See header
*/
pts_file_meas_t *pts_file_meas_create_from_path(u_int16_t request_id,
pts_file_meas_t *pts_file_meas_create_from_path(uint16_t request_id,
char *pathname, bool is_dir, bool use_rel_name,
pts_meas_algorithms_t alg)
{
src/libimcv/pts/pts_file_meas.h
+3 -3
View File
@@ -38,7 +38,7 @@ struct pts_file_meas_t {
*
* @return ID of PTS File Measurement Request
*/
u_int16_t (*get_request_id)(pts_file_meas_t *this);
uint16_t (*get_request_id)(pts_file_meas_t *this);
/**
* Get the number of measured files
@@ -94,7 +94,7 @@ struct pts_file_meas_t {
*
* @param request_id ID of PTS File Measurement Request
*/
pts_file_meas_t* pts_file_meas_create(u_int16_t request_id);
pts_file_meas_t* pts_file_meas_create(uint16_t request_id);
/**
* Creates a pts_file_meas_t object measuring a file/directory
@@ -105,7 +105,7 @@ pts_file_meas_t* pts_file_meas_create(u_int16_t request_id);
* @param use_rel_name TRUE if relative filenames are to be used
* @param alg PTS hash measurement algorithm to be used
*/
pts_file_meas_t* pts_file_meas_create_from_path(u_int16_t request_id,
pts_file_meas_t* pts_file_meas_create_from_path(uint16_t request_id,
char* pathname, bool is_dir, bool use_rel_name,
pts_meas_algorithms_t alg);
src/libimcv/pts/pts_file_meta.h
+6 -6
View File
@@ -34,12 +34,12 @@ typedef struct pts_file_metadata_t pts_file_metadata_t;
*/
struct pts_file_metadata_t {
pts_file_type_t type;
u_int64_t filesize;
u_int64_t created;
u_int64_t modified;
u_int64_t accessed;
u_int64_t owner;
u_int64_t group;
uint64_t filesize;
uint64_t created;
uint64_t modified;
uint64_t accessed;
uint64_t owner;
uint64_t group;
char *filename;
};
src/libimcv/pts/pts_pcr.c
+16 -16
View File
@@ -40,17 +40,17 @@ struct private_pts_pcr_t {
/**
* Number of extended PCR registers
*/
u_int32_t pcr_count;
uint32_t pcr_count;
/**
* Highest extended PCR register
*/
u_int32_t pcr_max;
uint32_t pcr_max;
/**
* Bitmap of extended PCR registers
*/
u_int8_t pcr_select[PTS_PCR_MAX_NUM / 8];
uint8_t pcr_select[PTS_PCR_MAX_NUM / 8];
/**
* Hasher used to extend shadow PCRs
@@ -59,16 +59,16 @@ struct private_pts_pcr_t {
};
METHOD(pts_pcr_t, get_count, u_int32_t,
METHOD(pts_pcr_t, get_count, uint32_t,
private_pts_pcr_t *this)
{
return this->pcr_count;
}
METHOD(pts_pcr_t, select_pcr, bool,
private_pts_pcr_t *this, u_int32_t pcr)
private_pts_pcr_t *this, uint32_t pcr)
{
u_int32_t i, f;
uint32_t i, f;
if (pcr >= PTS_PCR_MAX_NUM)
{
@@ -106,7 +106,7 @@ typedef struct {
/** implements enumerator_t */
enumerator_t public;
/** current PCR */
u_int32_t pcr;
uint32_t pcr;
/** back reference to parent */
private_pts_pcr_t *pcrs;
} pcr_enumerator_t;
@@ -116,11 +116,11 @@ typedef struct {
*/
static bool pcr_enumerator_enumerate(pcr_enumerator_t *this, ...)
{
u_int32_t *pcr, i, f;
uint32_t *pcr, i, f;
va_list args;
va_start(args, this);
pcr = va_arg(args, u_int32_t*);
pcr = va_arg(args, uint32_t*);
va_end(args);
while (this->pcr <= this->pcrs->pcr_max)
@@ -158,13 +158,13 @@ METHOD(pts_pcr_t, create_enumerator, enumerator_t*,
}
METHOD(pts_pcr_t, get, chunk_t,
private_pts_pcr_t *this, u_int32_t pcr)
private_pts_pcr_t *this, uint32_t pcr)
{
return (pcr < PTS_PCR_MAX_NUM) ? this->pcrs[pcr] : chunk_empty;
}
METHOD(pts_pcr_t, set, bool,
private_pts_pcr_t *this, u_int32_t pcr, chunk_t value)
private_pts_pcr_t *this, uint32_t pcr, chunk_t value)
{
if (value.len != PTS_PCR_LEN)
{
@@ -180,7 +180,7 @@ METHOD(pts_pcr_t, set, bool,
}
METHOD(pts_pcr_t, extend, chunk_t,
private_pts_pcr_t *this, u_int32_t pcr, chunk_t measurement)
private_pts_pcr_t *this, uint32_t pcr, chunk_t measurement)
{
if (measurement.len != PTS_PCR_LEN)
{
@@ -205,8 +205,8 @@ METHOD(pts_pcr_t, get_composite, chunk_t,
{
chunk_t composite;
enumerator_t *enumerator;
u_int16_t selection_size;
u_int32_t pcr_field_size, pcr;
uint16_t selection_size;
uint32_t pcr_field_size, pcr;
u_char *pos;
selection_size = get_selection_size(this);
@@ -236,7 +236,7 @@ METHOD(pts_pcr_t, get_composite, chunk_t,
METHOD(pts_pcr_t, destroy, void,
private_pts_pcr_t *this)
{
u_int32_t i;
uint32_t i;
for (i = 0; i < PTS_PCR_MAX_NUM; i++)
{
@@ -253,7 +253,7 @@ pts_pcr_t *pts_pcr_create(void)
{
private_pts_pcr_t *this;
hasher_t *hasher;
u_int32_t i;
uint32_t i;
hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA1);
if (!hasher)
src/libimcv/pts/pts_pcr.h
+5 -5
View File
@@ -45,7 +45,7 @@ struct pts_pcr_t {
*
* @return number of selected PCRs
*/
u_int32_t (*get_count)(pts_pcr_t *this);
uint32_t (*get_count)(pts_pcr_t *this);
/**
* Mark a PCR as selected
@@ -53,7 +53,7 @@ struct pts_pcr_t {
* @param pcr index of PCR
* @return TRUE if PCR index exists
*/
bool (*select_pcr)(pts_pcr_t *this, u_int32_t pcr);
bool (*select_pcr)(pts_pcr_t *this, uint32_t pcr);
/**
* Get the size of the selection field in bytes
@@ -75,7 +75,7 @@ struct pts_pcr_t {
* @param pcr index of PCR
* @return content of PCR
*/
chunk_t (*get)(pts_pcr_t *this, u_int32_t pcr);
chunk_t (*get)(pts_pcr_t *this, uint32_t pcr);
/**
* Set the content of a PCR
@@ -84,7 +84,7 @@ struct pts_pcr_t {
* @param value new value of PCR
* @return TRUE if value could be set
*/
bool (*set)(pts_pcr_t *this, u_int32_t pcr, chunk_t value);
bool (*set)(pts_pcr_t *this, uint32_t pcr, chunk_t value);
/**
* Extend the content of a PCR
@@ -93,7 +93,7 @@ struct pts_pcr_t {
* @param measurement measurment value to be extended into PCR
* @return new content of PCR
*/
chunk_t (*extend)(pts_pcr_t *this, u_int32_t pcr, chunk_t measurement);
chunk_t (*extend)(pts_pcr_t *this, uint32_t pcr, chunk_t measurement);
/**
* Create a PCR Composite object over all selected PCRs
src/libimcv/pwg/pwg_attr.c
+1 -1
View File
@@ -75,7 +75,7 @@ ENUM_END(pwg_attr_names, PWG_HCD_CONFIGURATION_STATE);
/**
* See header
*/
pa_tnc_attr_t* pwg_attr_create_from_data(u_int32_t type, size_t length, chunk_t value)
pa_tnc_attr_t* pwg_attr_create_from_data(uint32_t type, size_t length, chunk_t value)
{
switch (type)
{
src/libimcv/pwg/pwg_attr.h
+1 -1
View File
@@ -69,7 +69,7 @@ extern enum_name_t *pwg_attr_names;
* @param length attribute length
* @param value attribute value or segment
*/
pa_tnc_attr_t* pwg_attr_create_from_data(u_int32_t type, size_t length,
pa_tnc_attr_t* pwg_attr_create_from_data(uint32_t type, size_t length,
chunk_t value);
#endif /** PWG_ATTR_H_ @}*/
src/libimcv/pwg/pwg_attr_vendor_smi_code.c
+1 -1
View File
@@ -117,7 +117,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_pwg_attr_vendor_smi_code_t *this, u_int32_t *offset)
private_pwg_attr_vendor_smi_code_t *this, uint32_t *offset)
{
bio_reader_t *reader;
uint32_t vendor_smi_code;
src/libimcv/swid/swid_error.c
+2 -2
View File
@@ -27,8 +27,8 @@ ENUM(swid_error_code_names, TCG_SWID_ERROR, TCG_SWID_RESPONSE_TOO_LARGE,
/**
* Described in header.
*/
pa_tnc_attr_t* swid_error_create(swid_error_code_t code, u_int32_t request_id,
u_int32_t max_attr_size, char *description)
pa_tnc_attr_t* swid_error_create(swid_error_code_t code, uint32_t request_id,
uint32_t max_attr_size, char *description)
{
bio_writer_t *writer;
chunk_t msg_info;
src/libimcv/swid/swid_error.h
+2 -2
View File
@@ -52,7 +52,7 @@ extern enum_name_t *swid_error_code_names;
* @param max_attr_size Maximum IF-M attribute size (if applicable)
* @param description Optional description string or NULL
*/
pa_tnc_attr_t* swid_error_create(swid_error_code_t code, u_int32_t request,
u_int32_t max_attr_size, char *description);
pa_tnc_attr_t* swid_error_create(swid_error_code_t code, uint32_t request,
uint32_t max_attr_size, char *description);
#endif /** SWID_ERROR_H_ @}*/
src/libimcv/tcg/pts/tcg_pts_attr_aik.c
+3 -3
View File
@@ -108,7 +108,7 @@ METHOD(pa_tnc_attr_t, build, void,
private_tcg_pts_attr_aik_t *this)
{
bio_writer_t *writer;
u_int8_t flags = PTS_AIK_FLAGS_NONE;
uint8_t flags = PTS_AIK_FLAGS_NONE;
cred_encoding_type_t encoding_type = CERT_ASN1_DER;
chunk_t aik_blob;
@@ -136,10 +136,10 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_aik_t *this, u_int32_t *offset)
private_tcg_pts_attr_aik_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int8_t flags;
uint8_t flags;
certificate_type_t type;
chunk_t aik_blob;
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_finish.c
+3 -3
View File
@@ -140,11 +140,11 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_dh_nonce_finish_t *this, u_int32_t *offset)
private_tcg_pts_attr_dh_nonce_finish_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int8_t reserved, nonce_len;
u_int16_t hash_algo;
uint8_t reserved, nonce_len;
uint16_t hash_algo;
*offset = 0;
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_finish.h
+1 -1
View File
@@ -43,7 +43,7 @@ struct tcg_pts_attr_dh_nonce_finish_t {
*
* @return Length of nonce
*/
u_int8_t (*get_nonce_len)(tcg_pts_attr_dh_nonce_finish_t *this);
uint8_t (*get_nonce_len)(tcg_pts_attr_dh_nonce_finish_t *this);
/**
* Get selected hash algorithm
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_req.c
+6 -6
View File
@@ -72,7 +72,7 @@ struct private_tcg_pts_attr_dh_nonce_params_req_t {
/**
* Minimum acceptable length of nonce
*/
u_int8_t min_nonce_len;
uint8_t min_nonce_len;
/**
* Diffie Hellman group set
@@ -129,11 +129,11 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_dh_nonce_params_req_t *this, u_int32_t *offset)
private_tcg_pts_attr_dh_nonce_params_req_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int8_t reserved;
u_int16_t dh_groups;
uint8_t reserved;
uint16_t dh_groups;
*offset = 0;
@@ -179,7 +179,7 @@ METHOD(pa_tnc_attr_t, destroy, void,
}
}
METHOD(tcg_pts_attr_dh_nonce_params_req_t, get_min_nonce_len, u_int8_t,
METHOD(tcg_pts_attr_dh_nonce_params_req_t, get_min_nonce_len, uint8_t,
private_tcg_pts_attr_dh_nonce_params_req_t *this)
{
return this->min_nonce_len;
@@ -194,7 +194,7 @@ METHOD(tcg_pts_attr_dh_nonce_params_req_t, get_dh_groups, pts_dh_group_t,
/**
* Described in header.
*/
pa_tnc_attr_t *tcg_pts_attr_dh_nonce_params_req_create(u_int8_t min_nonce_len,
pa_tnc_attr_t *tcg_pts_attr_dh_nonce_params_req_create(uint8_t min_nonce_len,
pts_dh_group_t dh_groups)
{
private_tcg_pts_attr_dh_nonce_params_req_t *this;
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_req.h
+2 -2
View File
@@ -44,7 +44,7 @@ struct tcg_pts_attr_dh_nonce_params_req_t {
*
* @return Minimum acceptable length of nonce
*/
u_int8_t (*get_min_nonce_len)(tcg_pts_attr_dh_nonce_params_req_t *this);
uint8_t (*get_min_nonce_len)(tcg_pts_attr_dh_nonce_params_req_t *this);
/**
* Get supported Diffie Hellman Groups
@@ -60,7 +60,7 @@ struct tcg_pts_attr_dh_nonce_params_req_t {
* @param min_nonce_len Minimum acceptable length of nonce
* @param dh_groups Initiator's supported DH groups
*/
pa_tnc_attr_t* tcg_pts_attr_dh_nonce_params_req_create(u_int8_t min_nonce_len,
pa_tnc_attr_t* tcg_pts_attr_dh_nonce_params_req_create(uint8_t min_nonce_len,
pts_dh_group_t dh_groups);
/**
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c
+4 -4
View File
@@ -148,12 +148,12 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_dh_nonce_params_resp_t *this, u_int32_t *offset)
private_tcg_pts_attr_dh_nonce_params_resp_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int32_t reserved;
u_int8_t nonce_len;
u_int16_t dh_group, hash_algo_set;
uint32_t reserved;
uint8_t nonce_len;
uint16_t dh_group, hash_algo_set;
*offset = 0;
src/libimcv/tcg/pts/tcg_pts_attr_file_meas.c
+3 -3
View File
@@ -149,8 +149,8 @@ METHOD(pa_tnc_attr_t, build, void,
{
bio_writer_t *writer;
enumerator_t *enumerator;
u_int64_t count;
u_int16_t request_id;
uint64_t count;
uint16_t request_id;
char *filename;
chunk_t measurement;
bool first = TRUE;
@@ -192,7 +192,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_file_meas_t *this, u_int32_t *offset)
private_tcg_pts_attr_file_meas_t *this, uint32_t *offset)
{
bio_reader_t *reader;
chunk_t measurement, filename;
src/libimcv/tcg/pts/tcg_pts_attr_gen_attest_evid.c
+2 -2
View File
@@ -118,10 +118,10 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_gen_attest_evid_t *this, u_int32_t *offset)
private_tcg_pts_attr_gen_attest_evid_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int32_t reserved;
uint32_t reserved;
*offset = 0;
src/libimcv/tcg/pts/tcg_pts_attr_get_aik.c
+2 -2
View File
@@ -121,10 +121,10 @@ METHOD(pa_tnc_attr_t, add_segment, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_get_aik_t *this, u_int32_t *offset)
private_tcg_pts_attr_get_aik_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int32_t reserved;
uint32_t reserved;
*offset = 0;
src/libimcv/tcg/pts/tcg_pts_attr_get_tpm_version_info.c
+2 -2
View File
@@ -118,10 +118,10 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_get_tpm_version_info_t *this, u_int32_t *offset)
private_tcg_pts_attr_get_tpm_version_info_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int32_t reserved;
uint32_t reserved;
*offset = 0;
src/libimcv/tcg/pts/tcg_pts_attr_meas_algo.c
+2 -2
View File
@@ -121,10 +121,10 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_meas_algo_t *this, u_int32_t *offset)
private_tcg_pts_attr_meas_algo_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int16_t reserved, algorithms;
uint16_t reserved, algorithms;
*offset = 0;
src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.c
+2 -2
View File
@@ -123,10 +123,10 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_proto_caps_t *this, u_int32_t *offset)
private_tcg_pts_attr_proto_caps_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int16_t reserved, flags;
uint16_t reserved, flags;
*offset = 0;
src/libimcv/tcg/pts/tcg_pts_attr_req_file_meas.c
+10 -10
View File
@@ -85,12 +85,12 @@ struct private_tcg_pts_attr_req_file_meas_t {
/**
* Request ID
*/
u_int16_t request_id;
uint16_t request_id;
/**
* UTF8 Encoding of Delimiter Character
*/
u_int32_t delimiter;
uint32_t delimiter;
/**
* Fully Qualified File Pathname
@@ -130,7 +130,7 @@ METHOD(pa_tnc_attr_t, set_noskip_flag,void,
METHOD(pa_tnc_attr_t, build, void,
private_tcg_pts_attr_req_file_meas_t *this)
{
u_int8_t flags = PTS_REQ_FILE_MEAS_NO_FLAGS;
uint8_t flags = PTS_REQ_FILE_MEAS_NO_FLAGS;
chunk_t pathname;
bio_writer_t *writer;
@@ -156,11 +156,11 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_req_file_meas_t *this, u_int32_t *offset)
private_tcg_pts_attr_req_file_meas_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int8_t flags;
u_int8_t reserved;
uint8_t flags;
uint8_t reserved;
chunk_t pathname;
*offset = 0;
@@ -220,13 +220,13 @@ METHOD(tcg_pts_attr_req_file_meas_t, get_directory_flag, bool,
return this->directory_flag;
}
METHOD(tcg_pts_attr_req_file_meas_t, get_request_id, u_int16_t,
METHOD(tcg_pts_attr_req_file_meas_t, get_request_id, uint16_t,
private_tcg_pts_attr_req_file_meas_t *this)
{
return this->request_id;
}
METHOD(tcg_pts_attr_req_file_meas_t, get_delimiter, u_int32_t,
METHOD(tcg_pts_attr_req_file_meas_t, get_delimiter, uint32_t,
private_tcg_pts_attr_req_file_meas_t *this)
{
return this->delimiter;
@@ -242,8 +242,8 @@ METHOD(tcg_pts_attr_req_file_meas_t, get_pathname, char*,
* Described in header.
*/
pa_tnc_attr_t *tcg_pts_attr_req_file_meas_create(bool directory_flag,
u_int16_t request_id,
u_int32_t delimiter,
uint16_t request_id,
uint32_t delimiter,
char *pathname)
{
private_tcg_pts_attr_req_file_meas_t *this;
src/libimcv/tcg/pts/tcg_pts_attr_req_file_meas.h
+4 -4
View File
@@ -50,14 +50,14 @@ struct tcg_pts_attr_req_file_meas_t {
*
* @return Request ID
*/
u_int16_t (*get_request_id)(tcg_pts_attr_req_file_meas_t *this);
uint16_t (*get_request_id)(tcg_pts_attr_req_file_meas_t *this);
/**
* Get Delimiter
*
* @return UTF-8 encoding of a Delimiter Character
*/
u_int32_t (*get_delimiter)(tcg_pts_attr_req_file_meas_t *this);
uint32_t (*get_delimiter)(tcg_pts_attr_req_file_meas_t *this);
/**
* Get Fully Qualified File Pathname
@@ -77,8 +77,8 @@ struct tcg_pts_attr_req_file_meas_t {
* @param pathname File Pathname
*/
pa_tnc_attr_t* tcg_pts_attr_req_file_meas_create(bool directory_flag,
u_int16_t request_id,
u_int32_t delimiter,
uint16_t request_id,
uint32_t delimiter,
char *pathname);
/**
src/libimcv/tcg/pts/tcg_pts_attr_req_file_meta.c
+7 -7
View File
@@ -83,7 +83,7 @@ struct private_tcg_pts_attr_req_file_meta_t {
/**
* UTF8 Encoding of Delimiter Character
*/
u_int8_t delimiter;
uint8_t delimiter;
/**
* Fully Qualified File Pathname
@@ -123,7 +123,7 @@ METHOD(pa_tnc_attr_t, set_noskip_flag,void,
METHOD(pa_tnc_attr_t, build, void,
private_tcg_pts_attr_req_file_meta_t *this)
{
u_int8_t flags = PTS_REQ_FILE_META_NO_FLAGS;
uint8_t flags = PTS_REQ_FILE_META_NO_FLAGS;
chunk_t pathname;
bio_writer_t *writer;
@@ -149,11 +149,11 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_req_file_meta_t *this, u_int32_t *offset)
private_tcg_pts_attr_req_file_meta_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int8_t flags;
u_int16_t reserved;
uint8_t flags;
uint16_t reserved;
chunk_t pathname;
*offset = 0;
@@ -212,7 +212,7 @@ METHOD(tcg_pts_attr_req_file_meta_t, get_directory_flag, bool,
return this->directory_flag;
}
METHOD(tcg_pts_attr_req_file_meta_t, get_delimiter, u_int8_t,
METHOD(tcg_pts_attr_req_file_meta_t, get_delimiter, uint8_t,
private_tcg_pts_attr_req_file_meta_t *this)
{
return this->delimiter;
@@ -228,7 +228,7 @@ METHOD(tcg_pts_attr_req_file_meta_t, get_pathname, char*,
* Described in header.
*/
pa_tnc_attr_t *tcg_pts_attr_req_file_meta_create(bool directory_flag,
u_int8_t delimiter,
uint8_t delimiter,
char *pathname)
{
private_tcg_pts_attr_req_file_meta_t *this;
src/libimcv/tcg/pts/tcg_pts_attr_req_file_meta.h
+2 -2
View File
@@ -50,7 +50,7 @@ struct tcg_pts_attr_req_file_meta_t {
*
* @return UTF-8 encoding of a Delimiter Character
*/
u_int8_t (*get_delimiter)(tcg_pts_attr_req_file_meta_t *this);
uint8_t (*get_delimiter)(tcg_pts_attr_req_file_meta_t *this);
/**
* Get Fully Qualified File Pathname
@@ -69,7 +69,7 @@ struct tcg_pts_attr_req_file_meta_t {
* @param pathname File Pathname
*/
pa_tnc_attr_t* tcg_pts_attr_req_file_meta_create(bool directory_flag,
u_int8_t delimiter,
uint8_t delimiter,
char *pathname);
/**
src/libimcv/tcg/pts/tcg_pts_attr_req_func_comp_evid.c
+9 -9
View File
@@ -110,16 +110,16 @@ typedef struct entry_t entry_t;
* Functional component entry
*/
struct entry_t {
u_int8_t flags;
u_int32_t depth;
uint8_t flags;
uint32_t depth;
pts_comp_func_name_t *name;
};
/**
* Enumerate functional component entries
*/
static bool entry_filter(void *null, entry_t **entry, u_int8_t *flags,
void *i2, u_int32_t *depth, void *i3,
static bool entry_filter(void *null, entry_t **entry, uint8_t *flags,
void *i2, uint32_t *depth, void *i3,
pts_comp_func_name_t **name)
{
*flags = (*entry)->flags;
@@ -195,11 +195,11 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_req_func_comp_evid_t *this, u_int32_t *offset)
private_tcg_pts_attr_req_func_comp_evid_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int32_t depth, vendor_id, name;
u_int8_t flags, fam_and_qualifier, qualifier;
uint32_t depth, vendor_id, name;
uint8_t flags, fam_and_qualifier, qualifier;
status_t status = FAILED;
entry_t *entry = NULL;
@@ -296,8 +296,8 @@ METHOD(pa_tnc_attr_t, destroy, void,
}
METHOD(tcg_pts_attr_req_func_comp_evid_t, add_component, void,
private_tcg_pts_attr_req_func_comp_evid_t *this, u_int8_t flags,
u_int32_t depth, pts_comp_func_name_t *name)
private_tcg_pts_attr_req_func_comp_evid_t *this, uint8_t flags,
uint32_t depth, pts_comp_func_name_t *name)
{
entry_t *entry;
src/libimcv/tcg/pts/tcg_pts_attr_req_func_comp_evid.h
+1 -1
View File
@@ -47,7 +47,7 @@ struct tcg_pts_attr_req_func_comp_evid_t {
* @param name Functional Component Name
*/
void (*add_component)(tcg_pts_attr_req_func_comp_evid_t *this,
u_int8_t flags, u_int32_t depth,
uint8_t flags, uint32_t depth,
pts_comp_func_name_t *name);
/**
src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.c
+8 -8
View File
@@ -181,9 +181,9 @@ METHOD(pa_tnc_attr_t, build, void,
bio_writer_t *writer;
bool has_pcr_info;
char utc_time_buf[25], *policy_uri;
u_int8_t flags;
u_int16_t len;
u_int32_t depth, extended_pcr;
uint8_t flags;
uint16_t len;
uint32_t depth, extended_pcr;
pts_comp_func_name_t *name;
pts_meas_algorithms_t hash_algorithm;
pts_pcr_transform_t transform;
@@ -301,14 +301,14 @@ bool measurement_time_from_utc(time_t *measurement_time, chunk_t utc_time)
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_simple_comp_evid_t *this, u_int32_t *offset)
private_tcg_pts_attr_simple_comp_evid_t *this, uint32_t *offset)
{
bio_reader_t *reader;
pts_comp_func_name_t *name;
u_int8_t flags, fam_and_qualifier, qualifier, reserved;
u_int8_t measurement_type, transform, validation;
u_int16_t hash_algorithm, len;
u_int32_t depth, vendor_id, comp_name, extended_pcr;
uint8_t flags, fam_and_qualifier, qualifier, reserved;
uint8_t measurement_type, transform, validation;
uint16_t hash_algorithm, len;
uint32_t depth, vendor_id, comp_name, extended_pcr;
chunk_t measurement, utc_time, policy_uri, pcr_before, pcr_after;
time_t measurement_time;
bool has_pcr_info = FALSE, has_validation = FALSE;
src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.c
+8 -8
View File
@@ -81,7 +81,7 @@ struct private_tcg_pts_attr_simple_evid_final_t {
/**
* Set of flags for Simple Evidence Final
*/
u_int8_t flags;
uint8_t flags;
/**
* Optional Composite Hash Algorithm
@@ -168,7 +168,7 @@ METHOD(pa_tnc_attr_t, build, void,
private_tcg_pts_attr_simple_evid_final_t *this)
{
bio_writer_t *writer;
u_int8_t flags;
uint8_t flags;
if (this->value.ptr)
{
@@ -212,12 +212,12 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_simple_evid_final_t *this, u_int32_t *offset)
private_tcg_pts_attr_simple_evid_final_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int8_t flags, reserved;
u_int16_t algorithm;
u_int32_t pcr_comp_len, tpm_quote_sig_len, evid_sig_len;
uint8_t flags, reserved;
uint16_t algorithm;
uint32_t pcr_comp_len, tpm_quote_sig_len, evid_sig_len;
status_t status = FAILED;
*offset = 0;
@@ -296,7 +296,7 @@ end:
return status;
}
METHOD(tcg_pts_attr_simple_evid_final_t, get_quote_info, u_int8_t,
METHOD(tcg_pts_attr_simple_evid_final_t, get_quote_info, uint8_t,
private_tcg_pts_attr_simple_evid_final_t *this,
pts_meas_algorithms_t *comp_hash_algo, chunk_t *pcr_comp, chunk_t *tpm_quote_sig)
{
@@ -335,7 +335,7 @@ METHOD(tcg_pts_attr_simple_evid_final_t, set_evid_sig, void,
/**
* Described in header.
*/
pa_tnc_attr_t *tcg_pts_attr_simple_evid_final_create(u_int8_t flags,
pa_tnc_attr_t *tcg_pts_attr_simple_evid_final_create(uint8_t flags,
pts_meas_algorithms_t comp_hash_algorithm,
chunk_t pcr_comp, chunk_t tpm_quote_sig)
{
src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.h
+2 -2
View File
@@ -47,7 +47,7 @@ struct tcg_pts_attr_simple_evid_final_t {
* @param tpm_quote sig Optional TPM Quote Signature
* @return PTS_SIMPLE_EVID_FINAL flags
*/
u_int8_t (*get_quote_info)(tcg_pts_attr_simple_evid_final_t *this,
uint8_t (*get_quote_info)(tcg_pts_attr_simple_evid_final_t *this,
pts_meas_algorithms_t *comp_hash_algo,
chunk_t *pcr_comp, chunk_t *tpm_quote_sig);
@@ -79,7 +79,7 @@ struct tcg_pts_attr_simple_evid_final_t {
* @param tpm_quote_sign Optional TPM Quote Signature
*/
pa_tnc_attr_t* tcg_pts_attr_simple_evid_final_create(
u_int8_t flags,
uint8_t flags,
pts_meas_algorithms_t comp_hash_algorithm,
chunk_t pcr_comp,
chunk_t tpm_quote_sign);
src/libimcv/tcg/pts/tcg_pts_attr_tpm_version_info.c
+1 -1
View File
@@ -122,7 +122,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_tpm_version_info_t *this, u_int32_t *offset)
private_tcg_pts_attr_tpm_version_info_t *this, uint32_t *offset)
{
bio_reader_t *reader;
src/libimcv/tcg/pts/tcg_pts_attr_unix_file_meta.c
+6 -6
View File
@@ -144,7 +144,7 @@ METHOD(pa_tnc_attr_t, build, void,
bio_writer_t *writer;
enumerator_t *enumerator;
pts_file_metadata_t *entry;
u_int64_t number_of_files;
uint64_t number_of_files;
if (this->value.ptr)
{
@@ -179,14 +179,14 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_pts_attr_file_meta_t *this, u_int32_t *offset)
private_tcg_pts_attr_file_meta_t *this, uint32_t *offset)
{
bio_reader_t *reader;
pts_file_metadata_t *entry;
u_int8_t type, reserved;
u_int16_t len;
u_int64_t number_of_files, filesize, created, modified, accessed;
u_int64_t owner, group;
uint8_t type, reserved;
uint16_t len;
uint64_t number_of_files, filesize, created, modified, accessed;
uint64_t owner, group;
chunk_t filename;
status_t status = FAILED;
src/libimcv/tcg/seg/tcg_seg_attr_max_size.c
+1 -1
View File
@@ -124,7 +124,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_seg_attr_max_size_t *this, u_int32_t *offset)
private_tcg_seg_attr_max_size_t *this, uint32_t *offset)
{
bio_reader_t *reader;
src/libimcv/tcg/seg/tcg_seg_attr_next_seg.c
+1 -1
View File
@@ -128,7 +128,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_seg_attr_next_seg_t *this, u_int32_t *offset)
private_tcg_seg_attr_next_seg_t *this, uint32_t *offset)
{
bio_reader_t *reader;
uint8_t flags;
src/libimcv/tcg/seg/tcg_seg_attr_seg_env.c
+1 -1
View File
@@ -119,7 +119,7 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_seg_attr_seg_env_t *this, u_int32_t *offset)
private_tcg_seg_attr_seg_env_t *this, uint32_t *offset)
{
bio_reader_t *reader;
src/libimcv/tcg/swid/tcg_swid_attr_req.c
+10 -10
View File
@@ -80,17 +80,17 @@ struct private_tcg_swid_attr_req_t {
/**
* SWID request flags
*/
u_int8_t flags;
uint8_t flags;
/**
* Request ID
*/
u_int32_t request_id;
uint32_t request_id;
/**
* Earliest EID
*/
u_int32_t earliest_eid;
uint32_t earliest_eid;
/**
* List of Target Tag Identifiers
@@ -162,10 +162,10 @@ METHOD(pa_tnc_attr_t, build, void,
}
METHOD(pa_tnc_attr_t, process, status_t,
private_tcg_swid_attr_req_t *this, u_int32_t *offset)
private_tcg_swid_attr_req_t *this, uint32_t *offset)
{
bio_reader_t *reader;
u_int32_t tag_id_count;
uint32_t tag_id_count;
chunk_t tag_creator, unique_sw_id;
swid_tag_id_t *tag_id;
@@ -244,19 +244,19 @@ METHOD(pa_tnc_attr_t, destroy, void,
}
}
METHOD(tcg_swid_attr_req_t, get_flags, u_int8_t,
METHOD(tcg_swid_attr_req_t, get_flags, uint8_t,
private_tcg_swid_attr_req_t *this)
{
return this->flags;
}
METHOD(tcg_swid_attr_req_t, get_request_id, u_int32_t,
METHOD(tcg_swid_attr_req_t, get_request_id, uint32_t,
private_tcg_swid_attr_req_t *this)
{
return this->request_id;
}
METHOD(tcg_swid_attr_req_t, get_earliest_eid, u_int32_t,
METHOD(tcg_swid_attr_req_t, get_earliest_eid, uint32_t,
private_tcg_swid_attr_req_t *this)
{
return this->earliest_eid;
@@ -277,8 +277,8 @@ METHOD(tcg_swid_attr_req_t, get_targets, swid_inventory_t*,
/**
* Described in header.
*/
pa_tnc_attr_t *tcg_swid_attr_req_create(u_int8_t flags, u_int32_t request_id,
u_int32_t eid)
pa_tnc_attr_t *tcg_swid_attr_req_create(uint8_t flags, uint32_t request_id,
uint32_t eid)
{
private_tcg_swid_attr_req_t *this;
src/libimcv/tcg/swid/tcg_swid_attr_req.h
+5 -5
View File
@@ -53,21 +53,21 @@ struct tcg_swid_attr_req_t {
*
* @return Flags
*/
u_int8_t (*get_flags)(tcg_swid_attr_req_t *this);
uint8_t (*get_flags)(tcg_swid_attr_req_t *this);
/**
* Get Request ID
*
* @return Request ID
*/
u_int32_t (*get_request_id)(tcg_swid_attr_req_t *this);
uint32_t (*get_request_id)(tcg_swid_attr_req_t *this);
/**
* Get Earliest EID
*
* @return Event ID
*/
u_int32_t (*get_earliest_eid)(tcg_swid_attr_req_t *this);
uint32_t (*get_earliest_eid)(tcg_swid_attr_req_t *this);
/**
* Add Tag ID
@@ -92,8 +92,8 @@ struct tcg_swid_attr_req_t {
* @param request_id Request ID
* @param eid Earliest Event ID
*/
pa_tnc_attr_t* tcg_swid_attr_req_create(u_int8_t flags, u_int32_t request_id,
u_int32_t eid);
pa_tnc_attr_t* tcg_swid_attr_req_create(uint8_t flags, uint32_t request_id,
uint32_t eid);
/**
* Creates an tcg_swid_attr_req_t object from received data

Some files were not shown because too many files have changed in this diff Show More