[v2,WIP,1/7] validation: ipsec: fix packet checksums

Message ID 1515830407-13301-2-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series
  • Validate checksums during packet parsing
Related show

Commit Message

Github ODP bot Jan. 13, 2018, 8 a.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 389 (lumag:parse-checksums)
 ** https://github.com/Linaro/odp/pull/389
 ** Patch: https://github.com/Linaro/odp/pull/389.patch
 ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea
 ** Merge commit sha: 29d9c9fa8235c01897c72e823b57525e37f896d3
 **/
 test/validation/api/ipsec/ipsec.c        |  1 +
 test/validation/api/ipsec/test_vectors.h | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

Patch

diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index ea3cff052..322b03ad2 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -905,6 +905,7 @@  int ipsec_config(odp_instance_t ODP_UNUSED inst)
 	ipsec_config.outbound_mode = suite_context.outbound_op_mode;
 	ipsec_config.inbound.default_queue = suite_context.queue;
 	ipsec_config.inbound.parse_level = ODP_PROTO_LAYER_ALL;
+	ipsec_config.inbound.chksums.all_chksum = ~0;
 
 	if (ODP_IPSEC_OK != odp_ipsec_config(&ipsec_config))
 		return -1;
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index a6b8616b6..0a46ec758 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -264,7 +264,7 @@  static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_ah_sha256_1_bad1 = {
 
 		/* IP */
 		0x45, 0x00, 0x00, 0x9a, 0x00, 0x00, 0x00, 0x00,
-		0x40, 0x33, 0xab, 0xd9, 0xc0, 0xa8, 0x6f, 0x02,
+		0x40, 0x33, 0xab, 0xdb, 0xc0, 0xa8, 0x6f, 0x02,
 		0xc0, 0xa8, 0xde, 0x02,
 
 		/* AH */
@@ -664,7 +664,7 @@  static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_esp_aes_cbc_null_1 = {
 
 		/* IP */
 		0x45, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00,
-		0x40, 0x32, 0xab, 0xca, 0xc0, 0xa8, 0x6f, 0x02,
+		0x40, 0x32, 0xab, 0xda, 0xc0, 0xa8, 0x6f, 0x02,
 		0xc0, 0xa8, 0xde, 0x02,
 
 		/* ESP */
@@ -1494,7 +1494,7 @@  static const ipsec_test_packet pkt_mcgrew_gcm_test_2_esp = {
 
 		/* IP - not a part of RFC, added for simplicity */
 		0x45, 0x00, 0x00, 0x74, 0x69, 0x8f, 0x00, 0x00,
-		0x80, 0x32, 0x4d, 0x76, 0xc0, 0xa8, 0x01, 0x02,
+		0x80, 0x32, 0x4d, 0x75, 0xc0, 0xa8, 0x01, 0x02,
 		0xc0, 0xa8, 0x01, 0x01,
 
 		/* ESP */
@@ -1552,7 +1552,7 @@  static const ipsec_test_packet pkt_mcgrew_gcm_test_3_esp = {
 
 		/* IP - not a part of RFC, added for simplicity */
 		0x45, 0x00, 0x00, 0x68, 0x69, 0x8f, 0x00, 0x00,
-		0x80, 0x32, 0x4d, 0x82, 0xc0, 0xa8, 0x01, 0x02,
+		0x80, 0x32, 0x4d, 0x81, 0xc0, 0xa8, 0x01, 0x02,
 		0xc0, 0xa8, 0x01, 0x01,
 
 		/* ESP */
@@ -1610,7 +1610,7 @@  static const ipsec_test_packet pkt_mcgrew_gcm_test_4_esp = {
 
 		/* IP - not a part of RFC, added for simplicity */
 		0x45, 0x00, 0x00, 0x74, 0x69, 0x8f, 0x00, 0x00,
-		0x80, 0x32, 0x4d, 0x76, 0xc0, 0xa8, 0x01, 0x02,
+		0x80, 0x32, 0x4d, 0x75, 0xc0, 0xa8, 0x01, 0x02,
 		0xc0, 0xa8, 0x01, 0x01,
 
 		/* ESP */
@@ -1708,7 +1708,7 @@  static const ipsec_test_packet pkt_mcgrew_gcm_test_15_esp = {
 
 		/* IP - not a part of RFC, added for simplicity */
 		0x45, 0x00, 0x00, 0x68, 0x69, 0x8f, 0x00, 0x00,
-		0x80, 0x32, 0x4d, 0xb2, 0xc0, 0xa8, 0x01, 0x02,
+		0x80, 0x32, 0x4d, 0x81, 0xc0, 0xa8, 0x01, 0x02,
 		0xc0, 0xa8, 0x01, 0x01,
 
 		/* ESP */
@@ -1752,7 +1752,7 @@  static const ODP_UNUSED ipsec_test_packet
 		0x11, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
 
 		/* UDP encap */
-		0x11, 0x94, 0x11, 0x94, 0x00, 0x90, 0x00, 0x00,
+		0x11, 0x94, 0x11, 0x94, 0x00, 0x90, 0x51, 0x33,
 
 		/* ESP */
 		0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01,