Skip to content

Commit

Permalink
validation: crypto: test the null_crypto crypto operation parameter
Browse files Browse the repository at this point in the history 
Veridy that the null_crypto flag causes crypto to be skipped when
null_crypto is enabled at session creation and that the flag has no
effect otherwise.

Signed-off-by: Janne Peltonen <janne.peltonen@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
  • Loading branch information
@JannePeltonen @MatiasElo
JannePeltonen authored and MatiasElo committed Oct 20, 2023
1 parent f2688f2 commit de17bdb
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 18 deletions.
23 changes: 22 additions & 1 deletion test/validation/api/crypto/crypto_op_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ static int prepare_input_packet(const crypto_op_test_param_t *param,
pkt_len = param->header_len + reflength + param->trailer_len;
if (param->digest_offset == param->header_len + reflength)
pkt_len += ref->digest_length;
if (pkt_len == 0)
pkt_len = 1;

pkt = odp_packet_alloc(suite_context.pool, pkt_len);

Expand Down Expand Up @@ -482,7 +484,7 @@ static int is_digest_in_cipher_range(const crypto_op_test_param_t *param,
d_offset < op_params->cipher_range.offset + op_params->cipher_range.length;
}

void test_crypto_op(const crypto_op_test_param_t *param)
static void do_test_crypto_op(const crypto_op_test_param_t *param)
{
odp_bool_t ok = false;
odp_packet_t pkt;
Expand All @@ -497,6 +499,7 @@ void test_crypto_op(const crypto_op_test_param_t *param)
.hash_result_offset = param->digest_offset,
.aad_ptr = param->ref->aad,
.dst_offset_shift = param->oop_shift,
.null_crypto = param->null_crypto,
};
odp_bool_t failure_allowed = false;

Expand Down Expand Up @@ -589,3 +592,21 @@ void test_crypto_op(const crypto_op_test_param_t *param)
out:
odp_packet_free(pkt_out);
}

void test_crypto_op(const crypto_op_test_param_t *param)
{
crypto_op_test_param_t null_param = *param;
crypto_test_reference_t ref = *param->ref;

if (param->session.null_crypto_enable && param->null_crypto) {
null_param = *param;
null_param.ref = &ref;
ref = *param->ref;
ref.cipher = ODP_CIPHER_ALG_NULL;
ref.auth = ODP_AUTH_ALG_NULL;
ref.digest_length = 0;
memcpy(ref.ciphertext, ref.plaintext, sizeof(ref.ciphertext));
param = &null_param;
}
do_test_crypto_op(param);
}
2 changes: 2 additions & 0 deletions test/validation/api/crypto/crypto_op_test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ typedef struct crypto_session_t {
odp_crypto_op_type_t op_type;
odp_bool_t cipher_range_in_bits;
odp_bool_t auth_range_in_bits;
odp_bool_t null_crypto_enable;
} crypto_session_t;

typedef struct crypto_op_test_param_t {
Expand All @@ -27,6 +28,7 @@ typedef struct crypto_op_test_param_t {
odp_packet_data_range_t cipher_range;
odp_packet_data_range_t auth_range;
uint32_t digest_offset;
odp_bool_t null_crypto;
odp_bool_t adjust_segmentation;
odp_bool_t wrong_digest;
uint32_t first_seg_len;
Expand Down
59 changes: 42 additions & 17 deletions test/validation/api/crypto/odp_crypto_test_inp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ static void test_defaults(uint8_t fill)
CU_ASSERT_EQUAL(param.cipher_range_in_bits, false);
CU_ASSERT_EQUAL(param.auth_range_in_bits, false);
CU_ASSERT_EQUAL(param.auth_cipher_text, false);
CU_ASSERT_EQUAL(param.null_crypto_enable, false);
CU_ASSERT_EQUAL(param.op_mode, ODP_CRYPTO_SYNC);
CU_ASSERT_EQUAL(param.cipher_alg, ODP_CIPHER_ALG_NULL);
CU_ASSERT_EQUAL(param.cipher_iv_len, 0);
Expand Down Expand Up @@ -92,6 +93,10 @@ static void print_alg_test_param(const crypto_op_test_param_t *p)
printf("segmentation adjusted, first_seg_len: %d\n", p->first_seg_len);
if (p->session.op_type == ODP_CRYPTO_OP_TYPE_OOP)
printf("oop_shift: %d\n", p->oop_shift);
if (p->session.null_crypto_enable)
printf("null crypto enabled in session\n");
if (p->null_crypto)
printf("null crypto requested\n");
}

static void alg_test_execute_and_print(crypto_op_test_param_t *param)
Expand Down Expand Up @@ -127,8 +132,17 @@ static void alg_test_op(crypto_op_test_param_t *param)

param->wrong_digest = false;
alg_test_execute_and_print(param);

param->null_crypto = true;
alg_test_execute_and_print(param);
param->null_crypto = false;

if (full_test)
alg_test_execute_and_print(param); /* rerun with the same parameters */

if (!full_test && param->session.null_crypto_enable)
break;

param->wrong_digest = true;
alg_test_execute_and_print(param);
}
Expand Down Expand Up @@ -177,6 +191,7 @@ static int session_create(crypto_session_t *session,
ses_params.cipher_range_in_bits = session->cipher_range_in_bits;
ses_params.auth_range_in_bits = session->auth_range_in_bits;
ses_params.auth_cipher_text = (order == AUTH_CIPHERTEXT);
ses_params.null_crypto_enable = session->null_crypto_enable;
ses_params.op_mode = suite_context.op_mode;
ses_params.cipher_alg = ref->cipher;
ses_params.auth_alg = ref->auth;
Expand Down Expand Up @@ -258,6 +273,7 @@ static void alg_test_ses(odp_crypto_op_t op,
uint32_t digest_offset,
odp_bool_t cipher_range_in_bits,
odp_bool_t auth_range_in_bits,
odp_bool_t null_crypto_enable,
odp_bool_t session_creation_must_fail)
{
unsigned int initial_num_failures = CU_get_number_of_failures();
Expand All @@ -269,6 +285,9 @@ static void alg_test_ses(odp_crypto_op_t op,
uint32_t max_shift;
crypto_op_test_param_t test_param;

if (null_crypto_enable && suite_context.op_mode == ODP_CRYPTO_SYNC)
return;

if (digest_offset * auth_scale >= auth_range.offset &&
digest_offset * auth_scale < auth_range.offset + auth_range.length)
hash_mode = HASH_OVERLAP;
Expand All @@ -278,6 +297,7 @@ static void alg_test_ses(odp_crypto_op_t op,
test_param.session.op_type = op_type;
test_param.session.cipher_range_in_bits = cipher_range_in_bits;
test_param.session.auth_range_in_bits = auth_range_in_bits;
test_param.session.null_crypto_enable = null_crypto_enable;
if (session_create(&test_param.session, order, ref, hash_mode, session_creation_must_fail))
return;
test_param.ref = ref;
Expand All @@ -290,13 +310,14 @@ static void alg_test_ses(odp_crypto_op_t op,
max_shift = reflength + ref->digest_length;
seg_len = 0;

if (!full_test &&
ref->cipher != ODP_CIPHER_ALG_NULL &&
ref->auth != ODP_AUTH_ALG_NULL) {
/* run the loop body just once */
seg_len = max_shift / 2;
max_shift = seg_len;
}
if (!full_test)
if ((ref->cipher != ODP_CIPHER_ALG_NULL &&
ref->auth != ODP_AUTH_ALG_NULL) ||
test_param.session.null_crypto_enable) {
/* run the loop body just once */
seg_len = max_shift / 2;
max_shift = seg_len;
}

/*
* Test with segmented packets with all possible segment boundaries
Expand Down Expand Up @@ -345,16 +366,18 @@ static void alg_test_op_types(odp_crypto_op_t op,
};

for (unsigned int n = 0; n < ARRAY_SIZE(op_types); n++) {
alg_test_ses(op,
op_types[n],
order,
ref,
cipher_range,
auth_range,
digest_offset,
cipher_range_in_bits,
auth_range_in_bits,
session_creation_must_fail);
for (unsigned int null_crypto = 0 ; null_crypto <= 1; null_crypto++)
alg_test_ses(op,
op_types[n],
order,
ref,
cipher_range,
auth_range,
digest_offset,
cipher_range_in_bits,
auth_range_in_bits,
null_crypto,
session_creation_must_fail);
}
}

Expand Down Expand Up @@ -603,6 +626,7 @@ static int create_hash_test_reference(odp_auth_alg_t auth,
session.op_type = ODP_CRYPTO_OP_TYPE_BASIC;
session.cipher_range_in_bits = false;
session.auth_range_in_bits = false;
session.null_crypto_enable = false;
if (session_create(&session, AUTH_PLAINTEXT, ref, HASH_NO_OVERLAP, false))
return -1;

Expand Down Expand Up @@ -810,6 +834,7 @@ static int crypto_encode_ref(crypto_test_reference_t *ref,
session.op_type = ODP_CRYPTO_OP_TYPE_BASIC;
session.cipher_range_in_bits = false;
session.auth_range_in_bits = false;
session.null_crypto_enable = false;
if (session_create(&session, AUTH_PLAINTEXT, ref, HASH_OVERLAP, false)) {
odp_packet_free(pkt);
return 1;
Expand Down

0 comments on commit de17bdb

Please sign in to comment.