Signed-off-by: Robbie King <[email protected]>
---
example/ipsec/odp_ipsec.c | 12 ++++++------
example/ipsec/odp_ipsec_cache.c | 2 +-
example/ipsec/odp_ipsec_cache.h | 4 ++--
example/ipsec/odp_ipsec_misc.h | 4 ++--
example/ipsec/odp_ipsec_sa_db.c | 4 ++--
example/ipsec/odp_ipsec_sa_db.h | 4 ++--
example/ipsec/odp_ipsec_sp_db.h | 6 +++---
example/ipsec/odp_ipsec_stream.c | 10 +++++-----
example/ipsec/odp_ipsec_stream.h | 6 +++---
platform/linux-generic/include/api/odp_crypto.h | 6 +++---
platform/linux-generic/include/odp_crypto_internal.h | 2 +-
platform/linux-generic/odp_crypto.c | 4 ++--
test/validation/crypto/odp_crypto_test_async_inp.c | 2 +-
test/validation/crypto/odp_crypto_test_sync_inp.c | 2 +-
14 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index d22d7cb..b578f63 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -674,7 +674,7 @@ pkt_disposition_e do_route_fwd_db(odp_packet_t pkt,
pkt_ctx_t *ctx)
static
pkt_disposition_e do_ipsec_in_classify(odp_packet_t pkt,
pkt_ctx_t *ctx,
- bool *skip,
+ odp_bool_t *skip,
odp_crypto_op_result_t *result)
{
uint8_t *buf = odp_packet_data(pkt);
@@ -684,7 +684,7 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t pkt,
odph_esphdr_t *esp = NULL;
ipsec_cache_entry_t *entry;
odp_crypto_op_params_t params;
- bool posted = 0;
+ odp_bool_t posted = 0;
/* Default to skip IPsec */
*skip = TRUE;
@@ -834,7 +834,7 @@ pkt_disposition_e do_ipsec_in_finish(odp_packet_t pkt,
static
pkt_disposition_e do_ipsec_out_classify(odp_packet_t pkt,
pkt_ctx_t *ctx,
- bool *skip)
+ odp_bool_t *skip)
{
uint8_t *buf = odp_packet_data(pkt);
odph_ipv4hdr_t *ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL);
@@ -957,7 +957,7 @@ pkt_disposition_e do_ipsec_out_seq(odp_packet_t pkt,
odp_crypto_op_result_t *result)
{
uint8_t *buf = odp_packet_data(pkt);
- bool posted = 0;
+ odp_bool_t posted = 0;
/* We were dispatched from atomic queue, assign sequence numbers */
if (ctx->ipsec.ah_offset) {
@@ -1087,7 +1087,7 @@ void *pktio_thread(void *arg EXAMPLE_UNUSED)
* o PKT_POSTED - packet/event has been queued for later
*/
do {
- bool skip = FALSE;
+ odp_bool_t skip = FALSE;
switch (ctx->state) {
case PKT_STATE_INPUT_VERIFY:
@@ -1306,7 +1306,7 @@ main(int argc, char *argv[])
* wait indefinitely
*/
if (stream_count) {
- bool done;
+ odp_bool_t done;
do {
done = verify_stream_db_outputs();
sleep(1);
diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c
index 15180f2..5973dfe 100644
--- a/example/ipsec/odp_ipsec_cache.c
+++ b/example/ipsec/odp_ipsec_cache.c
@@ -39,7 +39,7 @@ void init_ipsec_cache(void)
int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa,
sa_db_entry_t *auth_sa,
crypto_api_mode_e api_mode,
- bool in,
+ odp_bool_t in,
odp_queue_t completionq,
odp_pool_t out_pool)
{
diff --git a/example/ipsec/odp_ipsec_cache.h b/example/ipsec/odp_ipsec_cache.h
index b436bd6..98624bc 100644
--- a/example/ipsec/odp_ipsec_cache.h
+++ b/example/ipsec/odp_ipsec_cache.h
@@ -31,7 +31,7 @@ typedef enum {
*/
typedef struct ipsec_cache_entry_s {
struct ipsec_cache_entry_s *next; /**< Next entry on list */
- bool in_place; /**< Crypto API mode */
+ odp_bool_t in_place; /**< Crypto API mode */
uint32_t src_ip; /**< Source v4 address */
uint32_t dst_ip; /**< Destination v4 address */
struct {
@@ -88,7 +88,7 @@ void init_ipsec_cache(void);
int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa,
sa_db_entry_t *auth_sa,
crypto_api_mode_e api_mode,
- bool in,
+ odp_bool_t in,
odp_queue_t completionq,
odp_pool_t out_pool);
diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec/odp_ipsec_misc.h
index ee6dee5..ba26e18 100644
--- a/example/ipsec/odp_ipsec_misc.h
+++ b/example/ipsec/odp_ipsec_misc.h
@@ -57,7 +57,7 @@ typedef struct {
* IPsec algorithm
*/
typedef struct {
- bool cipher;
+ odp_bool_t cipher;
union {
enum odp_cipher_alg cipher;
enum odp_auth_alg auth;
@@ -324,7 +324,7 @@ void ipv4_adjust_len(odph_ipv4hdr_t *ip, int adj)
* @return TRUE if all OK else FALSE
*/
static inline
-bool is_crypto_compl_status_ok(odp_crypto_compl_status_t *status)
+odp_bool_t is_crypto_compl_status_ok(odp_crypto_compl_status_t *status)
{
if (status->alg_err != ODP_CRYPTO_ALG_ERR_NONE)
return FALSE;
diff --git a/example/ipsec/odp_ipsec_sa_db.c b/example/ipsec/odp_ipsec_sa_db.c
index 384c0ce..cf619d8 100644
--- a/example/ipsec/odp_ipsec_sa_db.c
+++ b/example/ipsec/odp_ipsec_sa_db.c
@@ -34,7 +34,7 @@ void init_sa_db(void)
memset(sa_db, 0, sizeof(*sa_db));
}
-int create_sa_db_entry(char *input, bool cipher)
+int create_sa_db_entry(char *input, odp_bool_t cipher)
{
int pos = 0;
char *local;
@@ -163,7 +163,7 @@ void dump_sa_db(void)
sa_db_entry_t *find_sa_db_entry(ip_addr_range_t *src,
ip_addr_range_t *dst,
- bool cipher)
+ odp_bool_t cipher)
{
sa_db_entry_t *entry = NULL;
diff --git a/example/ipsec/odp_ipsec_sa_db.h b/example/ipsec/odp_ipsec_sa_db.h
index 0c1205e..c30cbdb 100644
--- a/example/ipsec/odp_ipsec_sa_db.h
+++ b/example/ipsec/odp_ipsec_sa_db.h
@@ -50,7 +50,7 @@ void init_sa_db(void);
*
* @return 0 if successful else -1
*/
-int create_sa_db_entry(char *input, bool cipher);
+int create_sa_db_entry(char *input, odp_bool_t cipher);
/**
* Display the SA DB
*/
@@ -67,7 +67,7 @@ void dump_sa_db(void);
*/
sa_db_entry_t *find_sa_db_entry(ip_addr_range_t *src,
ip_addr_range_t *dst,
- bool cipher);
+ odp_bool_t cipher);
#ifdef __cplusplus
}
diff --git a/example/ipsec/odp_ipsec_sp_db.h b/example/ipsec/odp_ipsec_sp_db.h
index 9523741..735c20e 100644
--- a/example/ipsec/odp_ipsec_sp_db.h
+++ b/example/ipsec/odp_ipsec_sp_db.h
@@ -20,9 +20,9 @@ typedef struct sp_db_entry_s {
struct sp_db_entry_s *next; /**< Next entry on list */
ip_addr_range_t src_subnet; /**< Source IPv4 subnet/range */
ip_addr_range_t dst_subnet; /**< Destination IPv4 subnet/range */
- bool input; /**< Direction when applied */
- bool esp; /**< Enable cipher (ESP) */
- bool ah; /**< Enable authentication (AH) */
+ odp_bool_t input; /**< Direction when applied */
+ odp_bool_t esp; /**< Enable cipher (ESP) */
+ odp_bool_t ah; /**< Enable authentication (AH) */
} sp_db_entry_t;
/**
diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c
index 7368a53..5d0e401 100644
--- a/example/ipsec/odp_ipsec_stream.c
+++ b/example/ipsec/odp_ipsec_stream.c
@@ -334,8 +334,8 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream,
return pkt;
}
-bool verify_ipv4_packet(stream_db_entry_t *stream,
- odp_packet_t pkt)
+odp_bool_t verify_ipv4_packet(stream_db_entry_t *stream,
+ odp_packet_t pkt)
{
ipsec_cache_entry_t *entry = stream->output.entry;
uint8_t *data;
@@ -510,9 +510,9 @@ int create_stream_db_inputs(void)
return created;
}
-bool verify_stream_db_outputs(void)
+odp_bool_t verify_stream_db_outputs(void)
{
- bool done = TRUE;
+ odp_bool_t done = TRUE;
stream_db_entry_t *stream = NULL;
/* For each stream look for output packets */
@@ -539,7 +539,7 @@ bool verify_stream_db_outputs(void)
if (!count)
break;
for (idx = 0; idx < count; idx++) {
- bool good;
+ odp_bool_t good;
odp_packet_t pkt;
pkt = odp_packet_from_event(ev_tbl[idx]);
diff --git a/example/ipsec/odp_ipsec_stream.h b/example/ipsec/odp_ipsec_stream.h
index 6ae7895..b71fc32 100644
--- a/example/ipsec/odp_ipsec_stream.h
+++ b/example/ipsec/odp_ipsec_stream.h
@@ -102,8 +102,8 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream,
*
* @return TRUE if packet verifies else FALSE
*/
-bool verify_ipv4_packet(stream_db_entry_t *stream,
- odp_packet_t pkt);
+odp_bool_t verify_ipv4_packet(stream_db_entry_t *stream,
+ odp_packet_t pkt);
/**
* Create input packets based on the stream DB
@@ -125,7 +125,7 @@ int create_stream_db_inputs(void);
*
* @return TRUE if all packets on all streams verified else FALSE
*/
-bool verify_stream_db_outputs(void);
+odp_bool_t verify_stream_db_outputs(void);
#ifdef __cplusplus
}
diff --git a/platform/linux-generic/include/api/odp_crypto.h
b/platform/linux-generic/include/api/odp_crypto.h
index 978c7c0..9335381 100644
--- a/platform/linux-generic/include/api/odp_crypto.h
+++ b/platform/linux-generic/include/api/odp_crypto.h
@@ -106,7 +106,7 @@ typedef struct odp_crypto_data_range {
*/
typedef struct odp_crypto_session_params {
enum odp_crypto_op op; /**< Encode versus decode */
- bool auth_cipher_text; /**< Authenticate/cipher ordering */
+ odp_bool_t auth_cipher_text; /**< Authenticate/cipher ordering */
enum odp_crypto_op_mode pref_mode; /**< Preferred sync vs async */
enum odp_cipher_alg cipher_alg; /**< Cipher algorithm */
odp_crypto_key_t cipher_key; /**< Cipher key */
@@ -287,7 +287,7 @@ odp_crypto_compl_free(odp_crypto_compl_t completion_event);
*/
int
odp_crypto_operation(odp_crypto_op_params_t *params,
- bool *posted,
+ odp_bool_t *posted,
odp_crypto_op_result_t *result);
/**
@@ -312,7 +312,7 @@ odp_crypto_compl_result(odp_crypto_compl_t completion_event,
* @return 0 if succesful
*/
int
-odp_hw_random_get(uint8_t *buf, size_t *len, bool use_entropy);
+odp_hw_random_get(uint8_t *buf, size_t *len, odp_bool_t use_entropy);
/**
* @}
diff --git a/platform/linux-generic/include/odp_crypto_internal.h
b/platform/linux-generic/include/odp_crypto_internal.h
index a474b94..dd6c9cf 100644
--- a/platform/linux-generic/include/odp_crypto_internal.h
+++ b/platform/linux-generic/include/odp_crypto_internal.h
@@ -31,7 +31,7 @@ enum crypto_alg_err (*crypto_func_t)(odp_crypto_op_params_t
*params,
struct odp_crypto_generic_session {
uint32_t index;
enum odp_crypto_op op;
- bool do_cipher_first;
+ odp_bool_t do_cipher_first;
odp_queue_t compl_queue;
odp_pool_t output_pool;
struct {
diff --git a/platform/linux-generic/odp_crypto.c
b/platform/linux-generic/odp_crypto.c
index 302c53e..2f2d701 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -347,7 +347,7 @@ odp_crypto_session_create(odp_crypto_session_params_t
*params,
int
odp_crypto_operation(odp_crypto_op_params_t *params,
- bool *posted,
+ odp_bool_t *posted,
odp_crypto_op_result_t *result)
{
enum crypto_alg_err rc_cipher = ODP_CRYPTO_ALG_ERR_NONE;
@@ -445,7 +445,7 @@ odp_crypto_init_global(void)
}
int
-odp_hw_random_get(uint8_t *buf, size_t *len, bool use_entropy ODP_UNUSED)
+odp_hw_random_get(uint8_t *buf, size_t *len, odp_bool_t use_entropy ODP_UNUSED)
{
int rc;
rc = RAND_bytes(buf, *len);
diff --git a/test/validation/crypto/odp_crypto_test_async_inp.c
b/test/validation/crypto/odp_crypto_test_async_inp.c
index d74586f..53bb8d9 100644
--- a/test/validation/crypto/odp_crypto_test_async_inp.c
+++ b/test/validation/crypto/odp_crypto_test_async_inp.c
@@ -33,7 +33,7 @@ static void alg_test(enum odp_crypto_op op,
odp_crypto_session_t session;
int rc;
enum odp_crypto_ses_create_err status;
- bool posted;
+ odp_bool_t posted;
odp_event_t event;
odp_crypto_compl_t compl_event;
odp_crypto_op_result_t result;
diff --git a/test/validation/crypto/odp_crypto_test_sync_inp.c
b/test/validation/crypto/odp_crypto_test_sync_inp.c
index 424dd97..b8c067d 100644
--- a/test/validation/crypto/odp_crypto_test_sync_inp.c
+++ b/test/validation/crypto/odp_crypto_test_sync_inp.c
@@ -23,7 +23,7 @@ static void alg_test(enum odp_crypto_op op,
odp_crypto_session_t session;
int rc;
enum odp_crypto_ses_create_err status;
- bool posted;
+ odp_bool_t posted;
odp_crypto_op_result_t result;
odp_queue_t compl_queue = odp_queue_lookup("crypto-out");
--
1.9.1
_______________________________________________
lng-odp mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/lng-odp
