patch 'test/crypto: add missing MAC-I to PDCP vectors' has been queued to stable release 22.11.2
Xueming Li
xuemingl at nvidia.com
Mon Feb 27 07:59:24 CET 2023
Hi,
FYI, your patch has been queued to stable release 22.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/01/23. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=cbd714b1f9049bca073a4178e945e6c1bfa31837
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From cbd714b1f9049bca073a4178e945e6c1bfa31837 Mon Sep 17 00:00:00 2001
From: Volodymyr Fialko <vfialko at marvell.com>
Date: Tue, 24 Jan 2023 17:39:24 +0100
Subject: [PATCH] test/crypto: add missing MAC-I to PDCP vectors
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 7b2ae9efa223b220f4699c1940a6ed530e063bf8 ]
Existing PDCP 12-bit C/U-plane output vectors with NULL encryption + NULL
integrity do not contain the MAC-I (32-bit of all zeros according to the
specification).
Vectors for other SN length (5, 18 bits) have the MAC-I set.
Fixes: d883e6e7131b ("test/crypto: add PDCP C-Plane encap cases")
Fixes: cca7d1f78524 ("test/crypto: add PDCP U-Plane encap with integrity cases")
Signed-off-by: Volodymyr Fialko <vfialko at marvell.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
app/test/test_cryptodev_security_pdcp_test_vectors.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/test/test_cryptodev_security_pdcp_test_vectors.h b/app/test/test_cryptodev_security_pdcp_test_vectors.h
index 6fdc4cd9e3..56d4884529 100644
--- a/app/test/test_cryptodev_security_pdcp_test_vectors.h
+++ b/app/test/test_cryptodev_security_pdcp_test_vectors.h
@@ -5560,7 +5560,7 @@ static uint8_t *pdcp_test_data_out[] = {
0xC2, 0xE2, 0x91, 0x91, 0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70,
0x33, 0x8A, 0x15, 0xD0, 0x36, 0x47, 0x0E, 0x8F, 0xEE, 0x2C,
0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B, 0x01, 0x7F, 0x96, 0x46,
- 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD},
+ 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0x00, 0x00, 0x00, 0x00},
/* Control Plane w/NULL enc. + NULL int. DL LONG SN */
(uint8_t[]){0xA0, 0x00, 0x86, 0xB8, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82,
0x53, 0xFD, 0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71,
@@ -5568,7 +5568,7 @@ static uint8_t *pdcp_test_data_out[] = {
0xC2, 0xE2, 0x91, 0x91, 0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70,
0x33, 0x8A, 0x15, 0xD0, 0x36, 0x47, 0x0E, 0x8F, 0xEE, 0x2C,
0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B, 0x01, 0x7F, 0x96, 0x46,
- 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD},
+ 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0x00, 0x00, 0x00, 0x00},
/* Control Plane w/NULL enc. + SNOW f9 int. UL LONG SN */
(uint8_t[]){0x00, 0x01, 0x86, 0xB8, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82,
0x53, 0xFD, 0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71,
@@ -5954,7 +5954,7 @@ static uint8_t *pdcp_test_data_out[] = {
0xC2, 0xE2, 0x91, 0x91, 0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70,
0x33, 0x8A, 0x15, 0xD0, 0x36, 0x47, 0x0E, 0x8F, 0xEE, 0x2C,
0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B, 0x01, 0x7F, 0x96, 0x46,
- 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD},
+ 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0x00, 0x00, 0x00, 0x00},
/* User Plane w/NULL enc. + NULL int. DL for 12-bit SN */
(uint8_t[]){0xA0, 0x00, 0x86, 0xB8, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82,
0x53, 0xFD, 0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71,
@@ -5962,7 +5962,7 @@ static uint8_t *pdcp_test_data_out[] = {
0xC2, 0xE2, 0x91, 0x91, 0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70,
0x33, 0x8A, 0x15, 0xD0, 0x36, 0x47, 0x0E, 0x8F, 0xEE, 0x2C,
0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B, 0x01, 0x7F, 0x96, 0x46,
- 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD},
+ 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0x00, 0x00, 0x00, 0x00},
/* User Plane w/NULL enc. + SNOW f9 int. UL for 12-bit SN */
(uint8_t[]){0x80, 0x01, 0x86, 0xB8, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82,
0x53, 0xFD, 0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71,
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-02-27 14:08:42.742989600 +0800
+++ 0057-test-crypto-add-missing-MAC-I-to-PDCP-vectors.patch 2023-02-27 14:08:40.779237000 +0800
@@ -1 +1 @@
-From 7b2ae9efa223b220f4699c1940a6ed530e063bf8 Mon Sep 17 00:00:00 2001
+From cbd714b1f9049bca073a4178e945e6c1bfa31837 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 7b2ae9efa223b220f4699c1940a6ed530e063bf8 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list