[v2] examples/fips_validation: fix incorrect string for CT length
Checks
Commit Message
The NIST test vectors use the string 'PTlen' to denote text lengths
in case of encrypt & decrypt operations. So the same string need to be
used while parsing PT and CT.
Fixes: 2adb3b4e7e54 ("examples/fips_validation: fix AES-GCM cipher length parsing")
Signed-off-by: Anoob Joseph <anoobj@marvell.com>
---
v2:
* Fixed incorrect fixes tag
examples/fips_validation/fips_validation_gcm.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Comments
Hi Fan, Akhil,
Can you review this patch? Without this change, the app would not work for AES-GCM decrypt.
Thanks,
Anoob
> -----Original Message-----
> From: Anoob Joseph <anoobj@marvell.com>
> Sent: Tuesday, February 18, 2020 4:01 PM
> To: Marko Kovacevic <marko.kovacevic@intel.com>; Akhil Goyal
> <akhil.goyal@nxp.com>; David Marchand <david.marchand@redhat.com>
> Cc: Anoob Joseph <anoobj@marvell.com>; Fan Zhang
> <roy.fan.zhang@intel.com>; Narayana Prasad Raju Athreya
> <pathreya@marvell.com>; dev@dpdk.org
> Subject: [PATCH v2] examples/fips_validation: fix incorrect string for CT
> length
>
> The NIST test vectors use the string 'PTlen' to denote text lengths in case of
> encrypt & decrypt operations. So the same string need to be used while
> parsing PT and CT.
>
> Fixes: 2adb3b4e7e54 ("examples/fips_validation: fix AES-GCM cipher length
> parsing")
>
> Signed-off-by: Anoob Joseph <anoobj@marvell.com>
> ---
>
> v2:
> * Fixed incorrect fixes tag
>
> examples/fips_validation/fips_validation_gcm.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/examples/fips_validation/fips_validation_gcm.c
> b/examples/fips_validation/fips_validation_gcm.c
> index bc2d37d..47576e9 100644
> --- a/examples/fips_validation/fips_validation_gcm.c
> +++ b/examples/fips_validation/fips_validation_gcm.c
> @@ -19,7 +19,6 @@
> #define PTLEN_STR "PTlen = "
> #define AADLEN_STR "AADlen = "
> #define TAGLEN_STR "Taglen = "
> -#define CTLEN_STR "CTlen = "
>
> #define COUNT_STR "Count = "
> #define KEY_STR "Key = "
> @@ -47,7 +46,10 @@ struct fips_test_callback gcm_interim_vectors[] = {
> {KEYLEN_STR, parser_read_uint32_bit_val, &vec.aead.key},
> {IVLEN_STR, parser_read_uint32_bit_val, &vec.iv},
> {PTLEN_STR, parser_read_uint32_bit_val, &vec.pt},
> - {CTLEN_STR, parser_read_uint32_bit_val, &vec.ct},
> + {PTLEN_STR, parser_read_uint32_bit_val, &vec.ct},
> + /**< The NIST test vectors use 'PTlen' to denote input text
> + * length in case of decrypt & encrypt operations.
> + */
> {AADLEN_STR, parser_read_uint32_bit_val, &vec.aead.aad},
> {TAGLEN_STR, parser_read_uint32_bit_val,
> &vec.aead.digest},
> --
> 2.7.4
>
> The NIST test vectors use the string 'PTlen' to denote text lengths
> in case of encrypt & decrypt operations. So the same string need to be
> used while parsing PT and CT.
>
> Fixes: 2adb3b4e7e54 ("examples/fips_validation: fix AES-GCM cipher length
> parsing")
>
> Signed-off-by: Anoob Joseph <anoobj@marvell.com>
> ---
>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
Hi David,
Are you picking this patch or is it intended for crypto tree?
Regards,
Akhil
On Thu, Feb 20, 2020 at 11:15 AM Akhil Goyal <akhil.goyal@nxp.com> wrote:
> > The NIST test vectors use the string 'PTlen' to denote text lengths
> > in case of encrypt & decrypt operations. So the same string need to be
> > used while parsing PT and CT.
> >
> > Fixes: 2adb3b4e7e54 ("examples/fips_validation: fix AES-GCM cipher length
> > parsing")
> >
> > Signed-off-by: Anoob Joseph <anoobj@marvell.com>
> > ---
> >
> Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
>
> Are you picking this patch or is it intended for crypto tree?
I'll take it.
On Thu, Feb 20, 2020 at 11:15 AM Akhil Goyal <akhil.goyal@nxp.com> wrote:
> > The NIST test vectors use the string 'PTlen' to denote text lengths
> > in case of encrypt & decrypt operations. So the same string need to be
> > used while parsing PT and CT.
> >
> > Fixes: 2adb3b4e7e54 ("examples/fips_validation: fix AES-GCM cipher length
> > parsing")
> >
> > Signed-off-by: Anoob Joseph <anoobj@marvell.com>
> > ---
> >
> Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
Applied, thanks.
@@ -19,7 +19,6 @@
#define PTLEN_STR "PTlen = "
#define AADLEN_STR "AADlen = "
#define TAGLEN_STR "Taglen = "
-#define CTLEN_STR "CTlen = "
#define COUNT_STR "Count = "
#define KEY_STR "Key = "
@@ -47,7 +46,10 @@ struct fips_test_callback gcm_interim_vectors[] = {
{KEYLEN_STR, parser_read_uint32_bit_val, &vec.aead.key},
{IVLEN_STR, parser_read_uint32_bit_val, &vec.iv},
{PTLEN_STR, parser_read_uint32_bit_val, &vec.pt},
- {CTLEN_STR, parser_read_uint32_bit_val, &vec.ct},
+ {PTLEN_STR, parser_read_uint32_bit_val, &vec.ct},
+ /**< The NIST test vectors use 'PTlen' to denote input text
+ * length in case of decrypt & encrypt operations.
+ */
{AADLEN_STR, parser_read_uint32_bit_val, &vec.aead.aad},
{TAGLEN_STR, parser_read_uint32_bit_val,
&vec.aead.digest},