aboutsummaryrefslogtreecommitdiffstats
path: root/src/charon-tkm
diff options
context:
space:
mode:
Diffstat (limited to 'src/charon-tkm')
-rw-r--r--src/charon-tkm/src/tkm/tkm_diffie_hellman.c6
-rw-r--r--src/charon-tkm/src/tkm/tkm_kernel_ipsec.c28
-rw-r--r--src/charon-tkm/src/tkm/tkm_kernel_sad.c32
-rw-r--r--src/charon-tkm/src/tkm/tkm_kernel_sad.h10
-rw-r--r--src/charon-tkm/src/tkm/tkm_keymat.c8
-rw-r--r--src/charon-tkm/src/tkm/tkm_nonceg.c2
-rw-r--r--src/charon-tkm/src/tkm/tkm_spi_generator.c12
-rw-r--r--src/charon-tkm/tests/nonceg_tests.c6
8 files changed, 52 insertions, 52 deletions
diff --git a/src/charon-tkm/src/tkm/tkm_diffie_hellman.c b/src/charon-tkm/src/tkm/tkm_diffie_hellman.c
index c4953b6aa..5f2cbfe0c 100644
--- a/src/charon-tkm/src/tkm/tkm_diffie_hellman.c
+++ b/src/charon-tkm/src/tkm/tkm_diffie_hellman.c
@@ -123,7 +123,7 @@ int register_dh_mapping()
int count, i;
char *iana_id_str, *tkm_id_str;
diffie_hellman_group_t *iana_id;
- u_int64_t *tkm_id;
+ uint64_t *tkm_id;
hashtable_t *map;
enumerator_t *enumerator;
@@ -138,7 +138,7 @@ int register_dh_mapping()
{
iana_id = malloc_thing(diffie_hellman_group_t);
*iana_id = settings_value_as_int(iana_id_str, 0);
- tkm_id = malloc_thing(u_int64_t);
+ tkm_id = malloc_thing(uint64_t);
*tkm_id = settings_value_as_int(tkm_id_str, 0);
map->put(map, iana_id, tkm_id);
@@ -227,7 +227,7 @@ tkm_diffie_hellman_t *tkm_diffie_hellman_create(diffie_hellman_group_t group)
return NULL;
}
- u_int64_t *dha_id = group_map->get(group_map, &group);
+ uint64_t *dha_id = group_map->get(group_map, &group);
if (!dha_id)
{
free(this);
diff --git a/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c b/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
index 2d22fbdc3..ba2e164c9 100644
--- a/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
+++ b/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
@@ -54,7 +54,7 @@ struct private_tkm_kernel_ipsec_t {
METHOD(kernel_ipsec_t, get_spi, status_t,
private_tkm_kernel_ipsec_t *this, host_t *src, host_t *dst,
- u_int8_t protocol, u_int32_t *spi)
+ uint8_t protocol, uint32_t *spi)
{
bool result;
@@ -68,24 +68,24 @@ METHOD(kernel_ipsec_t, get_spi, status_t,
}
}
- result = this->rng->get_bytes(this->rng, sizeof(u_int32_t),
- (u_int8_t *)spi);
+ result = this->rng->get_bytes(this->rng, sizeof(uint32_t),
+ (uint8_t *)spi);
return result ? SUCCESS : FAILED;
}
METHOD(kernel_ipsec_t, get_cpi, status_t,
private_tkm_kernel_ipsec_t *this, host_t *src, host_t *dst,
- u_int16_t *cpi)
+ uint16_t *cpi)
{
return NOT_SUPPORTED;
}
METHOD(kernel_ipsec_t, add_sa, status_t,
private_tkm_kernel_ipsec_t *this, host_t *src, host_t *dst,
- u_int32_t spi, u_int8_t protocol, u_int32_t reqid, mark_t mark,
- u_int32_t tfc, lifetime_cfg_t *lifetime, u_int16_t enc_alg, chunk_t enc_key,
- u_int16_t int_alg, chunk_t int_key, ipsec_mode_t mode,
- u_int16_t ipcomp, u_int16_t cpi, u_int32_t replay_window,
+ uint32_t spi, uint8_t protocol, uint32_t reqid, mark_t mark,
+ uint32_t tfc, lifetime_cfg_t *lifetime, uint16_t enc_alg, chunk_t enc_key,
+ uint16_t int_alg, chunk_t int_key, ipsec_mode_t mode,
+ uint16_t ipcomp, uint16_t cpi, uint32_t replay_window,
bool initiator, bool encap, bool esn, bool inbound, bool update,
linked_list_t* src_ts, linked_list_t* dst_ts)
{
@@ -209,15 +209,15 @@ sad_failure:
METHOD(kernel_ipsec_t, query_sa, status_t,
private_tkm_kernel_ipsec_t *this, host_t *src, host_t *dst,
- u_int32_t spi, u_int8_t protocol, mark_t mark, u_int64_t *bytes,
- u_int64_t *packets, time_t *time)
+ uint32_t spi, uint8_t protocol, mark_t mark, uint64_t *bytes,
+ uint64_t *packets, time_t *time)
{
return NOT_SUPPORTED;
}
METHOD(kernel_ipsec_t, del_sa, status_t,
private_tkm_kernel_ipsec_t *this, host_t *src, host_t *dst,
- u_int32_t spi, u_int8_t protocol, u_int16_t cpi, mark_t mark)
+ uint32_t spi, uint8_t protocol, uint16_t cpi, mark_t mark)
{
esa_id_type esa_id, other_esa_id;
@@ -249,8 +249,8 @@ METHOD(kernel_ipsec_t, del_sa, status_t,
}
METHOD(kernel_ipsec_t, update_sa, status_t,
- private_tkm_kernel_ipsec_t *this, u_int32_t spi, u_int8_t protocol,
- u_int16_t cpi, host_t *src, host_t *dst, host_t *new_src, host_t *new_dst,
+ private_tkm_kernel_ipsec_t *this, uint32_t spi, uint8_t protocol,
+ uint16_t cpi, host_t *src, host_t *dst, host_t *new_src, host_t *new_dst,
bool old_encap, bool new_encap, mark_t mark)
{
return NOT_SUPPORTED;
@@ -338,7 +338,7 @@ METHOD(kernel_ipsec_t, bypass_socket, bool,
}
METHOD(kernel_ipsec_t, enable_udp_decap, bool,
- private_tkm_kernel_ipsec_t *this, int fd, int family, u_int16_t port)
+ private_tkm_kernel_ipsec_t *this, int fd, int family, uint16_t port)
{
int type = UDP_ENCAP_ESPINUDP;
diff --git a/src/charon-tkm/src/tkm/tkm_kernel_sad.c b/src/charon-tkm/src/tkm/tkm_kernel_sad.c
index 2556f6b8b..22d2aac13 100644
--- a/src/charon-tkm/src/tkm/tkm_kernel_sad.c
+++ b/src/charon-tkm/src/tkm/tkm_kernel_sad.c
@@ -59,7 +59,7 @@ struct sad_entry_t {
/**
* Reqid.
*/
- u_int32_t reqid;
+ uint32_t reqid;
/**
* Source address of CHILD SA.
@@ -74,17 +74,17 @@ struct sad_entry_t {
/**
* Local SPI of CHILD SA.
*/
- u_int32_t spi_loc;
+ uint32_t spi_loc;
/**
* Remote SPI of CHILD SA.
*/
- u_int32_t spi_rem;
+ uint32_t spi_rem;
/**
* Protocol of CHILD SA (ESP/AH).
*/
- u_int8_t proto;
+ uint8_t proto;
};
@@ -105,8 +105,8 @@ static void sad_entry_destroy(sad_entry_t *entry)
* Find a list entry with given src, dst, (remote) spi and proto values.
*/
static bool sad_entry_match(sad_entry_t * const entry, const host_t * const src,
- const host_t * const dst, const u_int32_t * const spi,
- const u_int8_t * const proto)
+ const host_t * const dst, const uint32_t * const spi,
+ const uint8_t * const proto)
{
if (entry->src == NULL || entry->dst == NULL)
{
@@ -122,9 +122,9 @@ static bool sad_entry_match(sad_entry_t * const entry, const host_t * const src,
* Find a list entry with given reqid, spi and proto values.
*/
static bool sad_entry_match_dst(sad_entry_t * const entry,
- const u_int32_t * const reqid,
- const u_int32_t * const spi,
- const u_int8_t * const proto)
+ const uint32_t * const reqid,
+ const uint32_t * const spi,
+ const uint8_t * const proto)
{
return entry->reqid == *reqid &&
entry->spi_rem == *spi &&
@@ -145,7 +145,7 @@ static bool sad_entry_match_esa_id(sad_entry_t * const entry,
*/
static bool sad_entry_match_other_esa(sad_entry_t * const entry,
const esa_id_type * const esa_id,
- const u_int32_t * const reqid)
+ const uint32_t * const reqid)
{
return entry->reqid == *reqid &&
entry->esa_id != *esa_id;
@@ -172,8 +172,8 @@ static bool sad_entry_equal(sad_entry_t * const left, sad_entry_t * const right)
METHOD(tkm_kernel_sad_t, insert, bool,
private_tkm_kernel_sad_t * const this, const esa_id_type esa_id,
- const u_int32_t reqid, const host_t * const src, const host_t * const dst,
- const u_int32_t spi_loc, const u_int32_t spi_rem, const u_int8_t proto)
+ const uint32_t reqid, const host_t * const src, const host_t * const dst,
+ const uint32_t spi_loc, const uint32_t spi_rem, const uint8_t proto)
{
status_t result;
sad_entry_t *new_entry;
@@ -212,7 +212,7 @@ METHOD(tkm_kernel_sad_t, insert, bool,
METHOD(tkm_kernel_sad_t, get_esa_id, esa_id_type,
private_tkm_kernel_sad_t * const this, const host_t * const src,
- const host_t * const dst, const u_int32_t spi, const u_int8_t proto)
+ const host_t * const dst, const uint32_t spi, const uint8_t proto)
{
esa_id_type id = 0;
sad_entry_t *entry = NULL;
@@ -242,7 +242,7 @@ METHOD(tkm_kernel_sad_t, get_other_esa_id, esa_id_type,
{
esa_id_type id = 0;
sad_entry_t *entry = NULL;
- u_int32_t reqid;
+ uint32_t reqid;
status_t res;
this->mutex->lock(this->mutex);
@@ -274,8 +274,8 @@ METHOD(tkm_kernel_sad_t, get_other_esa_id, esa_id_type,
}
METHOD(tkm_kernel_sad_t, get_dst_host, host_t *,
- private_tkm_kernel_sad_t * const this, const u_int32_t reqid,
- const u_int32_t spi, const u_int8_t proto)
+ private_tkm_kernel_sad_t * const this, const uint32_t reqid,
+ const uint32_t spi, const uint8_t proto)
{
host_t *dst = NULL;
sad_entry_t *entry = NULL;
diff --git a/src/charon-tkm/src/tkm/tkm_kernel_sad.h b/src/charon-tkm/src/tkm/tkm_kernel_sad.h
index 3a84deffc..ba6462192 100644
--- a/src/charon-tkm/src/tkm/tkm_kernel_sad.h
+++ b/src/charon-tkm/src/tkm/tkm_kernel_sad.h
@@ -46,9 +46,9 @@ struct tkm_kernel_sad_t {
* @return TRUE if entry was inserted, FALSE otherwise
*/
bool (*insert)(tkm_kernel_sad_t * const this, const esa_id_type esa_id,
- const u_int32_t reqid, const host_t * const src,
- const host_t * const dst, const u_int32_t spi_loc,
- const u_int32_t spi_rem, const u_int8_t proto);
+ const uint32_t reqid, const host_t * const src,
+ const host_t * const dst, const uint32_t spi_loc,
+ const uint32_t spi_rem, const uint8_t proto);
/**
* Get ESA id for entry with given parameters.
@@ -61,7 +61,7 @@ struct tkm_kernel_sad_t {
*/
esa_id_type (*get_esa_id)(tkm_kernel_sad_t * const this,
const host_t * const src, const host_t * const dst,
- const u_int32_t spi, const u_int8_t proto);
+ const uint32_t spi, const uint8_t proto);
/**
* Get ESA id for entry associated with same security policy as the
@@ -82,7 +82,7 @@ struct tkm_kernel_sad_t {
* @return destination host of entry if found, NULL otherwise
*/
host_t * (*get_dst_host)(tkm_kernel_sad_t * const this,
- const u_int32_t reqid, const u_int32_t spi, const u_int8_t proto);
+ const uint32_t reqid, const uint32_t spi, const uint8_t proto);
/**
* Remove entry with given ESA id from SAD.
diff --git a/src/charon-tkm/src/tkm/tkm_keymat.c b/src/charon-tkm/src/tkm/tkm_keymat.c
index 1e1fa4f30..a7cce0f62 100644
--- a/src/charon-tkm/src/tkm/tkm_keymat.c
+++ b/src/charon-tkm/src/tkm/tkm_keymat.c
@@ -96,8 +96,8 @@ struct private_tkm_keymat_t {
static void aead_create_from_keys(aead_t **in, aead_t **out,
const chunk_t * const sk_ai, const chunk_t * const sk_ar,
const chunk_t * const sk_ei, const chunk_t * const sk_er,
- const u_int16_t enc_alg, const u_int16_t int_alg,
- const u_int16_t key_size, bool initiator)
+ const uint16_t enc_alg, const uint16_t int_alg,
+ const uint16_t key_size, bool initiator)
{
*in = *out = NULL;
signer_t *signer_i, *signer_r;
@@ -187,8 +187,8 @@ METHOD(keymat_v2_t, derive_ike_keys, bool,
chunk_t nonce_i, chunk_t nonce_r, ike_sa_id_t *id,
pseudo_random_function_t rekey_function, chunk_t rekey_skd)
{
- u_int16_t enc_alg, int_alg, key_size;
- u_int64_t nc_id, spi_loc, spi_rem;
+ uint16_t enc_alg, int_alg, key_size;
+ uint64_t nc_id, spi_loc, spi_rem;
chunk_t *nonce, c_ai, c_ar, c_ei, c_er;
tkm_diffie_hellman_t *tkm_dh;
dh_id_type dh_id;
diff --git a/src/charon-tkm/src/tkm/tkm_nonceg.c b/src/charon-tkm/src/tkm/tkm_nonceg.c
index 336f16ecd..493ea2922 100644
--- a/src/charon-tkm/src/tkm/tkm_nonceg.c
+++ b/src/charon-tkm/src/tkm/tkm_nonceg.c
@@ -39,7 +39,7 @@ struct private_tkm_nonceg_t {
};
METHOD(nonce_gen_t, get_nonce, bool,
- private_tkm_nonceg_t *this, size_t size, u_int8_t *buffer)
+ private_tkm_nonceg_t *this, size_t size, uint8_t *buffer)
{
nonce_type nonce;
uint64_t nc_id;
diff --git a/src/charon-tkm/src/tkm/tkm_spi_generator.c b/src/charon-tkm/src/tkm/tkm_spi_generator.c
index eff0ca91e..b9ce83727 100644
--- a/src/charon-tkm/src/tkm/tkm_spi_generator.c
+++ b/src/charon-tkm/src/tkm/tkm_spi_generator.c
@@ -25,8 +25,8 @@
*/
typedef struct {
rng_t *rng;
- u_int64_t spi_mask;
- u_int64_t spi_label;
+ uint64_t spi_mask;
+ uint64_t spi_label;
} get_spi_args_t;
static get_spi_args_t *spi_args;
@@ -37,12 +37,12 @@ static get_spi_args_t *spi_args;
* @param this Callback args containing rng_t and spi mask & label
* @return labeled SPI
*/
-CALLBACK(tkm_get_spi, u_int64_t,
+CALLBACK(tkm_get_spi, uint64_t,
const get_spi_args_t const *this)
{
- u_int64_t spi;
+ uint64_t spi;
- if (!this->rng->get_bytes(this->rng, sizeof(spi), (u_int8_t*)&spi))
+ if (!this->rng->get_bytes(this->rng, sizeof(spi), (uint8_t*)&spi))
{
return 0;
}
@@ -54,7 +54,7 @@ bool tkm_spi_generator_register(plugin_t *plugin,
plugin_feature_t *feature,
bool reg, void *cb_data)
{
- u_int64_t spi_mask, spi_label;
+ uint64_t spi_mask, spi_label;
char *spi_val;
rng_t *rng;
diff --git a/src/charon-tkm/tests/nonceg_tests.c b/src/charon-tkm/tests/nonceg_tests.c
index d150891eb..67c1635ef 100644
--- a/src/charon-tkm/tests/nonceg_tests.c
+++ b/src/charon-tkm/tests/nonceg_tests.c
@@ -37,7 +37,7 @@ START_TEST(test_nonceg_allocate_nonce)
tkm_nonceg_t *ng = tkm_nonceg_create();
const size_t length = 256;
- u_int8_t zero[length];
+ uint8_t zero[length];
memset(zero, 0, length);
chunk_t nonce;
@@ -61,10 +61,10 @@ START_TEST(test_nonceg_get_nonce)
tkm_nonceg_t *ng = tkm_nonceg_create();
const size_t length = 128;
- u_int8_t zero[length];
+ uint8_t zero[length];
memset(zero, 0, length);
- u_int8_t *buf = malloc(length + 1);
+ uint8_t *buf = malloc(length + 1);
memset(buf, 0, length);
/* set end marker */
buf[length] = 255;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 04:43:11 +0000