This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via b8d4e0f27c0979cd4fb628318b10b57538d67fdf (commit) from 58e1522451ae4a4ce62acad5ea2c47d96dafe3cd (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit b8d4e0f27c0979cd4fb628318b10b57538d67fdf Author: Matias Elo matias.elo@nokia.com Date: Thu Nov 7 16:31:03 2019 +0200
validation: ipsec: memset ipsec_test_part structs to zero
Explicitly initialize ipsec_test_part structs to zero to avoid "missing initializer for field" warnings with old compilers (Debian 8, GCC 4.9.2).
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@nokia.com Reported-by: Risto Teittinen risto.teittinen@nokia-bell-labs.com
diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c index 632e2ec8b..0e6497887 100644 --- a/test/validation/api/ipsec/ipsec_test_in.c +++ b/test/validation/api/ipsec/ipsec_test_in.c @@ -526,6 +526,9 @@ static void test_in_ipv4_ah_sha256_replay(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test_repl; + + memset(&test_repl, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, true, true, 123, NULL, @@ -550,15 +553,9 @@ static void test_in_ipv4_ah_sha256_replay(void) }, };
- ipsec_test_part test_repl = { - .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.antireplay = 1, - .pkt_out = NULL }, - }, - }; + test_repl.pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1; + test_repl.out_pkt = 1; + test_repl.out[0].status.error.antireplay = 1;
ipsec_test_part test_1235 = { .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1235, @@ -632,6 +629,9 @@ static void test_in_ipv4_esp_null_sha256_replay(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test_repl; + + memset(&test_repl, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, true, false, 123, NULL, @@ -656,15 +656,9 @@ static void test_in_ipv4_esp_null_sha256_replay(void) }, };
- ipsec_test_part test_repl = { - .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.antireplay = 1, - .pkt_out = NULL }, - }, - }; + test_repl.pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1; + test_repl.out_pkt = 1; + test_repl.out[0].status.error.antireplay = 1;
ipsec_test_part test_1235 = { .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1235, @@ -690,6 +684,9 @@ static void test_in_ipv4_ah_esp_pkt(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part));
/* This test will not work properly inbound inline mode. * test_in_ipv4_ah_esp_pkt_lookup will be used instead. */ @@ -706,15 +703,9 @@ static void test_in_ipv4_ah_esp_pkt(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.proto = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1; + test.out_pkt = 1; + test.out[0].status.error.proto = 1;
ipsec_check_in_one(&test, sa);
@@ -725,6 +716,9 @@ static void test_in_ipv4_esp_ah_pkt(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part));
/* This test will not work properly inbound inline mode. * test_in_ipv4_esp_ah_pkt_lookup will be used instead. */ @@ -741,15 +735,9 @@ static void test_in_ipv4_esp_ah_pkt(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.proto = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1; + test.out_pkt = 1; + test.out[0].status.error.proto = 1;
ipsec_check_in_one(&test, sa);
@@ -760,6 +748,9 @@ static void test_in_ipv4_ah_esp_pkt_lookup(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, true, true, 123, NULL, @@ -771,16 +762,10 @@ static void test_in_ipv4_ah_esp_pkt_lookup(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1, - .lookup = 1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.sa_lookup = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1; + test.lookup = 1; + test.out_pkt = 1; + test.out[0].status.error.sa_lookup = 1;
ipsec_check_in_one(&test, ODP_IPSEC_SA_INVALID);
@@ -791,6 +776,9 @@ static void test_in_ipv4_esp_ah_pkt_lookup(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, true, false, 123, NULL, @@ -802,16 +790,10 @@ static void test_in_ipv4_esp_ah_pkt_lookup(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1, - .lookup = 1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.sa_lookup = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1; + test.lookup = 1; + test.out_pkt = 1; + test.out[0].status.error.sa_lookup = 1;
ipsec_check_in_one(&test, ODP_IPSEC_SA_INVALID);
@@ -822,6 +804,9 @@ static void test_in_ipv4_ah_sha256_bad1(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, true, true, 123, NULL, @@ -833,15 +818,9 @@ static void test_in_ipv4_ah_sha256_bad1(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1_bad1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.auth = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1_bad1; + test.out_pkt = 1; + test.out[0].status.error.auth = 1;
ipsec_check_in_one(&test, sa);
@@ -852,6 +831,9 @@ static void test_in_ipv4_ah_sha256_bad2(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, true, true, 123, NULL, @@ -863,15 +845,9 @@ static void test_in_ipv4_ah_sha256_bad2(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1_bad2, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.auth = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1_bad2; + test.out_pkt = 1; + test.out[0].status.error.auth = 1;
ipsec_check_in_one(&test, sa);
@@ -882,6 +858,9 @@ static void test_in_ipv4_esp_null_sha256_bad1(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, true, false, 123, NULL, @@ -893,15 +872,9 @@ static void test_in_ipv4_esp_null_sha256_bad1(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1_bad1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.auth = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1_bad1; + test.out_pkt = 1; + test.out[0].status.error.auth = 1;
ipsec_check_in_one(&test, sa);
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c index 36de0cca1..0bfb9cff8 100644 --- a/test/validation/api/ipsec/ipsec_test_out.c +++ b/test/validation/api/ipsec/ipsec_test_out.c @@ -558,6 +558,11 @@ static void test_out_ipv4_ah_sha256_frag_check(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + ipsec_test_part test2; + + memset(&test, 0, sizeof(ipsec_test_part)); + memset(&test2, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, false, true, 123, NULL, @@ -571,28 +576,16 @@ static void test_out_ipv4_ah_sha256_frag_check(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.mtu = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0; + test.out_pkt = 1; + test.out[0].status.error.mtu = 1;
- ipsec_test_part test2 = { - .pkt_in = &pkt_ipv4_icmp_0, - .num_opt = 1, - .opt = { .flag.frag_mode = 1, - .frag_mode = ODP_IPSEC_FRAG_DISABLED, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .pkt_out = &pkt_ipv4_icmp_0_ah_sha256_1 }, - }, - }; + test2.pkt_in = &pkt_ipv4_icmp_0; + test2.num_opt = 1; + test2.opt.flag.frag_mode = 1; + test2.opt.frag_mode = ODP_IPSEC_FRAG_DISABLED; + test2.out_pkt = 1; + test2.out[0].pkt_out = &pkt_ipv4_icmp_0_ah_sha256_1;
ipsec_check_out_one(&test, sa);
@@ -605,6 +598,9 @@ static void test_out_ipv4_ah_sha256_frag_check_2(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, false, true, 123, NULL, @@ -618,15 +614,9 @@ static void test_out_ipv4_ah_sha256_frag_check_2(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.mtu = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0; + test.out_pkt = 1; + test.out[0].status.error.mtu = 1;
ipsec_test_part test2 = { .pkt_in = &pkt_ipv4_icmp_0, @@ -651,6 +641,11 @@ static void test_out_ipv4_esp_null_sha256_frag_check(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + ipsec_test_part test2; + + memset(&test, 0, sizeof(ipsec_test_part)); + memset(&test2, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, false, false, 123, NULL, @@ -665,28 +660,16 @@ static void test_out_ipv4_esp_null_sha256_frag_check(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.mtu = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0; + test.out_pkt = 1; + test.out[0].status.error.mtu = 1;
- ipsec_test_part test2 = { - .pkt_in = &pkt_ipv4_icmp_0, - .num_opt = 1, - .opt = { .flag.frag_mode = 1, - .frag_mode = ODP_IPSEC_FRAG_DISABLED, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .pkt_out = &pkt_ipv4_icmp_0_esp_null_sha256_1 }, - }, - }; + test2.pkt_in = &pkt_ipv4_icmp_0; + test2.num_opt = 1; + test2.opt.flag.frag_mode = 1; + test2.opt.frag_mode = ODP_IPSEC_FRAG_DISABLED; + test2.out_pkt = 1; + test2.out[0].pkt_out = &pkt_ipv4_icmp_0_esp_null_sha256_1;
ipsec_check_out_one(&test, sa);
@@ -699,6 +682,9 @@ static void test_out_ipv4_esp_null_sha256_frag_check_2(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part));
ipsec_sa_param_fill(¶m, false, false, 123, NULL, @@ -713,15 +699,9 @@ static void test_out_ipv4_esp_null_sha256_frag_check_2(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
- ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.mtu = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0; + test.out_pkt = 1; + test.out[0].status.error.mtu = 1;
ipsec_test_part test2 = { .pkt_in = &pkt_ipv4_icmp_0, @@ -1011,6 +991,11 @@ static void test_out_dummy_esp_null_sha256_tun_ipv4(void) odp_ipsec_sa_t sa2; uint32_t src = IPV4ADDR(10, 0, 111, 2); uint32_t dst = IPV4ADDR(10, 0, 222, 2); + ipsec_test_part test; + ipsec_test_part test_empty; + + memset(&test, 0, sizeof(ipsec_test_part)); + memset(&test_empty, 0, sizeof(ipsec_test_part));
memset(&tunnel, 0, sizeof(odp_ipsec_tunnel_param_t)); tunnel.type = ODP_IPSEC_TUNNEL_IPV4; @@ -1043,35 +1028,21 @@ static void test_out_dummy_esp_null_sha256_tun_ipv4(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2);
- ipsec_test_part test = { - .pkt_in = &pkt_test_nodata, - .num_opt = 1, - .opt = { .flag.tfc_dummy = 1, - .tfc_pad_len = 16, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .l3_type = ODP_PROTO_L3_TYPE_IPV4, - .l4_type = ODP_PROTO_L4_TYPE_NO_NEXT, - .pkt_out = NULL }, - }, - }; - - ipsec_test_part test_empty = { - .pkt_in = &pkt_test_emtpy, - .num_opt = 1, - .opt = { .flag.tfc_dummy = 1, - .tfc_pad_len = 16, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .l3_type = ODP_PROTO_L3_TYPE_IPV4, - .l4_type = ODP_PROTO_L4_TYPE_NO_NEXT, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_test_nodata; + test.num_opt = 1; + test.opt .flag.tfc_dummy = 1; + test.opt.tfc_pad_len = 16; + test.out_pkt = 1; + test.out[0].l3_type = ODP_PROTO_L3_TYPE_IPV4; + test.out[0].l4_type = ODP_PROTO_L4_TYPE_NO_NEXT; + + test_empty.pkt_in = &pkt_test_emtpy; + test_empty.num_opt = 1; + test_empty.opt.flag.tfc_dummy = 1; + test_empty.opt.tfc_pad_len = 16; + test_empty.out_pkt = 1; + test_empty.out[0].l3_type = ODP_PROTO_L3_TYPE_IPV4; + test_empty.out[0].l4_type = ODP_PROTO_L4_TYPE_NO_NEXT;
ipsec_check_out_in_one(&test, sa, sa2); ipsec_check_out_in_one(&test_empty, sa, sa2); @@ -1086,6 +1057,8 @@ static void test_out_dummy_esp_null_sha256_tun_ipv6(void) odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; odp_ipsec_sa_t sa2; + ipsec_test_part test; + ipsec_test_part test_empty; uint8_t src[16] = { 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a, @@ -1095,6 +1068,9 @@ static void test_out_dummy_esp_null_sha256_tun_ipv6(void) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, };
+ memset(&test, 0, sizeof(ipsec_test_part)); + memset(&test_empty, 0, sizeof(ipsec_test_part)); + memset(&tunnel, 0, sizeof(odp_ipsec_tunnel_param_t)); tunnel.type = ODP_IPSEC_TUNNEL_IPV6; tunnel.ipv6.src_addr = src; @@ -1126,35 +1102,21 @@ static void test_out_dummy_esp_null_sha256_tun_ipv6(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2);
- ipsec_test_part test = { - .pkt_in = &pkt_test_nodata, - .num_opt = 1, - .opt = { .flag.tfc_dummy = 1, - .tfc_pad_len = 16, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .l3_type = ODP_PROTO_L3_TYPE_IPV4, - .l4_type = ODP_PROTO_L4_TYPE_NO_NEXT, - .pkt_out = NULL }, - }, - }; - - ipsec_test_part test_empty = { - .pkt_in = &pkt_test_emtpy, - .num_opt = 1, - .opt = { .flag.tfc_dummy = 1, - .tfc_pad_len = 16, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .l3_type = ODP_PROTO_L3_TYPE_IPV4, - .l4_type = ODP_PROTO_L4_TYPE_NO_NEXT, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_test_nodata; + test.num_opt = 1; + test.opt .flag.tfc_dummy = 1; + test.opt.tfc_pad_len = 16; + test.out_pkt = 1; + test.out[0].l3_type = ODP_PROTO_L3_TYPE_IPV4; + test.out[0].l4_type = ODP_PROTO_L4_TYPE_NO_NEXT; + + test_empty.pkt_in = &pkt_test_emtpy; + test_empty.num_opt = 1; + test_empty.opt.flag.tfc_dummy = 1; + test_empty.opt.tfc_pad_len = 16; + test_empty.out_pkt = 1; + test_empty.out[0].l3_type = ODP_PROTO_L3_TYPE_IPV4; + test_empty.out[0].l4_type = ODP_PROTO_L4_TYPE_NO_NEXT;
ipsec_check_out_in_one(&test, sa, sa2); ipsec_check_out_in_one(&test_empty, sa, sa2);
-----------------------------------------------------------------------
Summary of changes: test/validation/api/ipsec/ipsec_test_in.c | 139 ++++++++------------ test/validation/api/ipsec/ipsec_test_out.c | 198 ++++++++++++----------------- 2 files changed, 136 insertions(+), 201 deletions(-)
hooks/post-receive
-
git＠git-us.linaro.org