examples/ipsec-secgw: support 192/256 AES key sizes
PATCH 1/1 examples/ipsec-secgw: support 192/256 AES key sizes
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBC
--- examples/ipsec-secgw/ipsec.h | 2 +- examples/ipsec-secgw/sa.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-)
examples/ipsec-secgw/ipsec.h +1 -1
@@ -72,7 +72,7 @@ struct ip_addr { } ip; }; -#define MAX_KEY_SIZE 32 +#define MAX_KEY_SIZE 36/* * application wide SA parameters
examples/ipsec-secgw/sa.c +25 -0
@@ -77,6 +77,13 @@ const struct supported_cipher_algo cipher_algos[] = { .key_len = 16 }, { + .keyword = "aes-192-cbc", + .algo = RTE_CRYPTO_CIPHER_AES_CBC, + .iv_len = 16, + .block_size = 16, + .key_len =24 + }, + { .keyword = "aes-256-cbc", .algo = RTE_CRYPTO_CIPHER_AES_CBC, .iv_len = 16,
@@ -130,6 +137,24 @@ const struct supported_aead_algo aead_algos[] = { .key_len = 20, .digest_len = 16, .aad_len = 8, + }, + { + .keyword = "aes-192-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 28, + .digest_len = 16, + .aad_len = 8, + }, + { + .keyword = "aes-256-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 36, + .digest_len = 16, + .aad_len = 8, } };
Signature · 1 line
2.7.4
Quoted 7 lines
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBC
Quoted 7 lines
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Tejasree Kondoj <[email protected]>--- examples/ipsec-secgw/ipsec.h | 2 +- examples/ipsec-secgw/sa.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-)
This would also need update in "doc/guides/sample_app_ug/ipsec_secgw.rst"
Hi Akhil,
Quoted 28 lines
-----Original Message-----
From: Akhil Goyal <[email protected]>
Sent: Thursday, March 26, 2020 12:07 AM
To: Anoob Joseph <[email protected]>; Radu Nicolau <[email protected]>
Cc: Narayana Prasad Raju Athreya <[email protected]>; Tejasree Kondoj <[email protected]>; [email protected]
Subject: [EXT] RE: [PATCH] examples/ipsec-secgw: support 192/256 AES key sizesExternal Email
----------------------------------------------------------------------
Quoted 6 lines
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBCQuoted 7 lines
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Tejasree Kondoj <[email protected]>--- examples/ipsec-secgw/ipsec.h | 2 +- examples/ipsec-secgw/sa.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-)
Quoted 1 line
This would also need update in "
doc/guides/sample_app_ug/ipsec_secgw.rst"
Will update in v2. Do I need to update release notes as well?
Thanks,
Anoob
Quoted 14 lines
Quoted 14 lines
Quoted 13 lines
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBCSigned-off-by Anoob Joseph <[email protected]>Signed-off-by Tejasree Kondoj <[email protected]>--- examples/ipsec-secgw/ipsec.h | 2 +- examples/ipsec-secgw/sa.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-)
Quoted 4 lines
Quoted 1 line
This would also need update in "
doc/guides/sample_app_ug/ipsec_secgw.rst"Will update in v2. Do I need to update release notes as well?
Yes you can add it.
PATCH v2 1/1 examples/ipsec-secgw: support 192/256 AES key sizes
In reply to Anoob JosephAdding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBC
---
v2:
* Updated doc and release notes
doc/guides/rel_notes/release_20_05.rst | 7 +++++++ doc/guides/sample_app_ug/ipsec_secgw.rst | 3 +++ examples/ipsec-secgw/ipsec.h | 2 +- examples/ipsec-secgw/sa.c | 25 +++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-)
doc/guides/rel_notes/release_20_05.rst +7 -0
@@ -70,6 +70,13 @@ New Features by making use of the event device capabilities. The event mode currently supports only inline IPsec protocol offload. +* **Added 192/256 AES key sizes in ipsec-secgw application.** + + Updated ipsec-secgw application to support the following key sizes, + - AES-192-CBC + - AES-192-GCM + - AES-256-GCM + Removed Items -------------
doc/guides/sample_app_ug/ipsec_secgw.rst +3 -0
@@ -538,6 +538,7 @@ where each options means: * *null*: NULL algorithm * *aes-128-cbc*: AES-CBC 128-bit algorithm + * *aes-192-cbc*: AES-CBC 192-bit algorithm * *aes-256-cbc*: AES-CBC 256-bit algorithm * *aes-128-ctr*: AES-CTR 128-bit algorithm * *3des-cbc*: 3DES-CBC 192-bit algorithm
@@ -593,6 +594,8 @@ where each options means: * Available options: * *aes-128-gcm*: AES-GCM 128-bit algorithm + * *aes-192-gcm*: AES-GCM 192-bit algorithm + * *aes-256-gcm*: AES-GCM 256-bit algorithm * Syntax: *cipher_algo <your algorithm>*
examples/ipsec-secgw/ipsec.h +1 -1
@@ -72,7 +72,7 @@ struct ip_addr { } ip; }; -#define MAX_KEY_SIZE 32 +#define MAX_KEY_SIZE 36/* * application wide SA parameters
examples/ipsec-secgw/sa.c +25 -0
@@ -77,6 +77,13 @@ const struct supported_cipher_algo cipher_algos[] = { .key_len = 16 }, { + .keyword = "aes-192-cbc", + .algo = RTE_CRYPTO_CIPHER_AES_CBC, + .iv_len = 16, + .block_size = 16, + .key_len =24 + }, + { .keyword = "aes-256-cbc", .algo = RTE_CRYPTO_CIPHER_AES_CBC, .iv_len = 16,
@@ -130,6 +137,24 @@ const struct supported_aead_algo aead_algos[] = { .key_len = 20, .digest_len = 16, .aad_len = 8, + }, + { + .keyword = "aes-192-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 28, + .digest_len = 16, + .aad_len = 8, + }, + { + .keyword = "aes-256-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 36, + .digest_len = 16, + .aad_len = 8, } };
Signature · 1 line
2.7.4
PATCH v3 1/1 examples/ipsec-secgw: support 192/256 AES key sizes
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBC
---
v3:
* Fixed incorrect AES-GCM key length being printed during app startup
* Introduced new macro 'SALT_SIZE' to make the usage more obvious (AES-GCM key has key following 4 byte salt)
* Minor cleanup for the existing code.
v2:
* Updated doc and release notes
doc/guides/rel_notes/release_20_05.rst | 7 ++++++ doc/guides/sample_app_ug/ipsec_secgw.rst | 3 +++ examples/ipsec-secgw/ipsec.h | 3 ++- examples/ipsec-secgw/sa.c | 38 ++++++++++++++++++++++++++------ 4 files changed, 43 insertions(+), 8 deletions(-)
doc/guides/rel_notes/release_20_05.rst +7 -0
@@ -70,6 +70,13 @@ New Features by making use of the event device capabilities. The event mode currently supports only inline IPsec protocol offload. +* **Added 192/256 AES key sizes in ipsec-secgw application.** + + Updated ipsec-secgw application to support the following key sizes, + - AES-192-CBC + - AES-192-GCM + - AES-256-GCM + Removed Items -------------
doc/guides/sample_app_ug/ipsec_secgw.rst +3 -0
@@ -538,6 +538,7 @@ where each options means: * *null*: NULL algorithm * *aes-128-cbc*: AES-CBC 128-bit algorithm + * *aes-192-cbc*: AES-CBC 192-bit algorithm * *aes-256-cbc*: AES-CBC 256-bit algorithm * *aes-128-ctr*: AES-CTR 128-bit algorithm * *3des-cbc*: 3DES-CBC 192-bit algorithm
@@ -593,6 +594,8 @@ where each options means: * Available options: * *aes-128-gcm*: AES-GCM 128-bit algorithm + * *aes-192-gcm*: AES-GCM 192-bit algorithm + * *aes-256-gcm*: AES-GCM 256-bit algorithm * Syntax: *cipher_algo <your algorithm>*
examples/ipsec-secgw/ipsec.h +2 -1
@@ -73,6 +73,7 @@ struct ip_addr { };#define MAX_KEY_SIZE 32 +#define SALT_SIZE 4/* * application wide SA parameters
@@ -133,7 +134,7 @@ struct ipsec_sa {#define IP6_TRANSPORT (1 << 4)struct ip_addr src;struct ip_addr dst; -uint8_t cipher_key[MAX_KEY_SIZE ]; +uint8_t cipher_key[MAX_KEY_SIZE +SALT_SIZE ];uint16_t cipher_key_len;uint8_t auth_key[MAX_KEY_SIZE ];uint16_t auth_key_len;
examples/ipsec-secgw/sa.c +31 -7
@@ -77,6 +77,13 @@ const struct supported_cipher_algo cipher_algos[] = { .key_len = 16 }, { + .keyword = "aes-192-cbc", + .algo = RTE_CRYPTO_CIPHER_AES_CBC, + .iv_len = 16, + .block_size = 16, + .key_len =24 + }, + { .keyword = "aes-256-cbc", .algo = RTE_CRYPTO_CIPHER_AES_CBC, .iv_len = 16,
@@ -127,7 +134,25 @@ const struct supported_aead_algo aead_algos[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .iv_len = 8, .block_size = 4, - .key_len = 20, + .key_len = 16, + .digest_len = 16, + .aad_len = 8, + }, + { + .keyword = "aes-192-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 24, + .digest_len = 16, + .aad_len = 8, + }, + { + .keyword = "aes-256-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 32, .digest_len = 16, .aad_len = 8, }
@@ -495,16 +520,14 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,return ; key_len =parse_key_string (tokens[ti], - rule->cipher_key); + rule->cipher_key) -SALT_SIZE ;APP_CHECK (key_len == rule->cipher_key_len, status,"unrecognized input \"%s\"" , tokens[ti]);if (status->status <0 )return ; - key_len -=4 ; - rule->cipher_key_len = key_len; -memcpy (&rule->salt, - &rule->cipher_key[key_len],4 ); +memcpy (&rule->salt, &rule->cipher_key[key_len], +SALT_SIZE ); aead_algo_p =1 ;continue ;
@@ -751,7 +774,8 @@ print_one_sa_rule(const struct ipsec_sa *sa, int inbound) }for (i =0 ; i <RTE_DIM (aead_algos); i++) { -if (aead_algos[i].algo == sa->aead_algo) { +if (aead_algos[i].algo == sa->aead_algo && + aead_algos[i].key_len == sa->cipher_key_len) {printf ("%s " , aead_algos[i].keyword);break ; }
Signature · 1 line
2.7.4
Hi Anoob,
Quoted 6 lines
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBC
Quoted 8 lines
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Tejasree Kondoj <[email protected]>---
v3:
* Fixed incorrect AES-GCM key length being printed during app startup
* Introduced new macro 'SALT_SIZE' to make the usage more obvious (AES-GCM key has key following 4 byte salt)
* Minor cleanup for the existing code.
I believe GCM keys are extended by 4 bytes to include the SALT value in many apps. We may add a comment that it is including the SALT value, but it makes more confusing now.
The length which is being printed is 16Bytes but we expect the user to have 20Bytes In the ep0.cfg file. This will be confusing also to configure the packet capturing APPs Like wireshark which accepts 20Byte keys in case of GCM.
Quoted 150 lines
v2:
* Updated doc and release notesdoc/guides/rel_notes/release_20_05.rst | 7 ++++++ doc/guides/sample_app_ug/ipsec_secgw.rst | 3 +++ examples/ipsec-secgw/ipsec.h | 3 ++- examples/ipsec-secgw/sa.c | 38 ++++++++++++++++++++++++++------ 4 files changed, 43 insertions(+), 8 deletions(-)doc/guides/rel_notes/release_20_05.rst +0
-0@@ -70,6 +70,13 @@ New Features by making use of the event device capabilities. The event mode currentlysupports
only inline IPsec protocol offload.doc/guides/rel_notes/release_20_05.rst +7
-0+* **Added 192/256 AES key sizes in ipsec-secgw application.** + + Updated ipsec-secgw application to support the following key sizes, + - AES-192-CBC + - AES-192-GCM + - AES-256-GCM + Removed Items -------------doc/guides/sample_app_ug/ipsec_secgw.rst +3
-0@@ -538,6 +538,7 @@ where each options means: * *null*: NULL algorithm * *aes-128-cbc*: AES-CBC 128-bit algorithm + * *aes-192-cbc*: AES-CBC 192-bit algorithm * *aes-256-cbc*: AES-CBC 256-bit algorithm * *aes-128-ctr*: AES-CTR 128-bit algorithm * *3des-cbc*: 3DES-CBC 192-bit algorithm@@ -593,6 +594,8 @@ where each options means: * Available options: * *aes-128-gcm*: AES-GCM 128-bit algorithm + * *aes-192-gcm*: AES-GCM 192-bit algorithm + * *aes-256-gcm*: AES-GCM 256-bit algorithm * Syntax: *cipher_algo <your algorithm>*examples/ipsec-secgw/ipsec.h +2
-1@@ -73,6 +73,7 @@ struct ip_addr { };#define MAX_KEY_SIZE 32 +#define SALT_SIZE 4/* * application wide SA parameters @@ -133,7 +134,7 @@ struct ipsec_sa {#define IP6_TRANSPORT (1 << 4)struct ip_addr src;struct ip_addr dst; -uint8_t cipher_key[MAX_KEY_SIZE ]; +uint8_t cipher_key[MAX_KEY_SIZE +SALT_SIZE ];uint16_t cipher_key_len;uint8_t auth_key[MAX_KEY_SIZE ];uint16_t auth_key_len;examples/ipsec-secgw/sa.c +31
-8@@ -77,6 +77,13 @@ const struct supported_cipher_algo cipher_algos[] = { .key_len = 16 }, { + .keyword = "aes-192-cbc", + .algo = RTE_CRYPTO_CIPHER_AES_CBC, + .iv_len = 16, + .block_size = 16, + .key_len =24 + }, + { .keyword = "aes-256-cbc", .algo = RTE_CRYPTO_CIPHER_AES_CBC, .iv_len = 16,@@ -127,7 +134,25 @@ const struct supported_aead_algo aead_algos[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .iv_len = 8, .block_size = 4, - .key_len = 20, + .key_len = 16, + .digest_len = 16, + .aad_len = 8, + }, + { + .keyword = "aes-192-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 24, + .digest_len = 16, + .aad_len = 8, + }, + { + .keyword = "aes-256-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 32, .digest_len = 16, .aad_len = 8, }@@ -495,16 +520,14 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,return ; key_len =parse_key_string (tokens[ti], - rule->cipher_key); + rule->cipher_key) -SALT_SIZE ;APP_CHECK (key_len == rule->cipher_key_len, status,"unrecognized input \"%s\"" , tokens[ti]);if (status->status <0 )return ; - key_len -=4 ; - rule->cipher_key_len = key_len; -memcpy (&rule->salt, - &rule->cipher_key[key_len],4 ); +memcpy (&rule->salt, &rule->cipher_key[key_len], +SALT_SIZE ); aead_algo_p =1 ;continue ;@@ -751,7 +774,8 @@ print_one_sa_rule(const struct ipsec_sa *sa, int inbound) }for (i =0 ; i <RTE_DIM (aead_algos); i++) { -if (aead_algos[i].algo == sa->aead_algo) { +if (aead_algos[i].algo == sa->aead_algo && + aead_algos[i].key_len == sa->cipher_key_len) {printf ("%s " , aead_algos[i].keyword);break ; } --2.7.4
Hi Akhil,
Please see inline.
Thanks,
Anoob
Quoted 31 lines
-----Original Message-----
From: Akhil Goyal <[email protected]>
Sent: Sunday, April 5, 2020 8:54 PM
To: Anoob Joseph <[email protected]>; Radu Nicolau <[email protected]>
Cc: Narayana Prasad Raju Athreya <[email protected]>; Tejasree Kondoj <[email protected]>; [email protected]
Subject: [EXT] RE: [PATCH v3] examples/ipsec-secgw: support 192/256 AES key sizesExternal Email
----------------------------------------------------------------------
Hi Anoob,Quoted 6 lines
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBCQuoted 6 lines
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Tejasree Kondoj <[email protected]>---
v3:
* Fixed incorrect AES-GCM key length being printed during app startup
* Introduced new macro 'SALT_SIZE' to make the usage more obvious (AES-GCM
Quoted 2 lines
key has key following 4 byte salt)
* Minor cleanup for the existing code.
Quoted 8 lines
I believe GCM keys are extended by 4 bytes to include the SALT value in many apps.
We may add a comment that it is including the SALT value, but it makes more confusing now.The length which is being printed is 16Bytes but we expect the user to have 20Bytes In the ep0.cfg file. This will be confusing also to configure the packet capturing APPs Like wireshark which accepts 20Byte keys in case of GCM.
[Anoob] The ones I've edited is just internal data structures. These are not exposed and not directly printed anywhere.
spi_in( 51):aes-128-gcm mode:IP4Tunnel 10.0.10.1 10.0.10.2 type:inline-protocol-offload spi_in( 52):aes-192-gcm mode:IP4Tunnel 10.0.20.1 10.0.20.2 type:inline-protocol-offload spi_in( 53):aes-256-gcm mode:IP4Tunnel 10.0.30.1 10.0.30.2 type:inline-protocol-offload
Also, my initial patch didn't try to address this aspect. In that patch, I had the following addition, in which key length was clearly not matching the string.
{
.keyword = "aes-192-gcm",
.algo = RTE_CRYPTO_AEAD_AES_GCM,
.iv_len = 8,
.block_size = 4,
.key_len = 28,
.digest_len = 16,
.aad_len = 8,
},In either case, the "misleading" part in config file would stay as the string would be "aes-128-gcm"/"aes-192-gcm"/"aes-256-gcm", and the key specified will have additional 4 bytes. Please do comment inline on what you think is the right approach. You can check if you are fine with v2 approach. I can resend that with a minor change required in the print.
One more thing. I was just checking the ipsec-secgw documentation of AEAD keys. I think we need to update that as well.
Syntax: Hexadecimal bytes (0x0-0xFF) concatenate by colon symbol ':'. The number of bytes should be as same as the specified AEAD algorithm key size.
For example: aead_key A1:B2:C3:D4:A1:B2:C3:D4:A1:B2:C3:D4: A1:B2:C3:D4
Can you advice on what should be the approach here?
Quoted 152 lines
examples/ipsec-secgw/sa.c print_one_sa_rule(const struct ipsec_sa *sa, int
Quoted 140 lines
v2:
* Updated doc and release notesdoc/guides/rel_notes/release_20_05.rst | 7 ++++++ doc/guides/sample_app_ug/ipsec_secgw.rst | 3 +++ examples/ipsec-secgw/ipsec.h | 3 ++- examples/ipsec-secgw/sa.c | 38 ++++++++++++++++++++++++++------ 4 files changed, 43 insertions(+), 8 deletions(-)doc/guides/rel_notes/release_20_05.rst +0
-0@@ -70,6 +70,13 @@ New Features by making use of the event device capabilities. The event modecurrently supports
only inline IPsec protocol offload.doc/guides/rel_notes/release_20_05.rst +7
-0+* **Added 192/256 AES key sizes in ipsec-secgw application.** + + Updated ipsec-secgw application to support the following key sizes, + - AES-192-CBC + - AES-192-GCM + - AES-256-GCM + Removed Items -------------doc/guides/sample_app_ug/ipsec_secgw.rst +1
-0@@ -538,6 +538,7 @@ where each options means: * *null*: NULL algorithm * *aes-128-cbc*: AES-CBC 128-bit algorithm + * *aes-192-cbc*: AES-CBC 192-bit algorithm * *aes-256-cbc*: AES-CBC 256-bit algorithm * *aes-128-ctr*: AES-CTR 128-bit algorithm * *3des-cbc*: 3DES-CBC 192-bit algorithm @@ -593,6 +594,8 @@ whereeach options means:
* Available options:* *aes-128-gcm*: AES-GCM 128-bit algorithm
doc/guides/sample_app_ug/ipsec_secgw.rst +2
-0+ * *aes-192-gcm*: AES-GCM 192-bit algorithm + * *aes-256-gcm*: AES-GCM 256-bit algorithm * Syntax: *cipher_algo <your algorithm>*(quoted diff) +0
-0
b/examples/ipsec-secgw/ipsec.hindex f8f29f9..476a6d5 100644examples/ipsec-secgw/ipsec.h +2
-1@@ -73,6 +73,7 @@ struct ip_addr { };#define MAX_KEY_SIZE 32 +#define SALT_SIZE 4/* * application wide SA parameters @@ -133,7 +134,7 @@ struct ipsec_sa {#define IP6_TRANSPORT (1 << 4)struct ip_addr src;struct ip_addr dst; -uint8_t cipher_key[MAX_KEY_SIZE ]; +uint8_t cipher_key[MAX_KEY_SIZE +SALT_SIZE ];uint16_t cipher_key_len;uint8_t auth_key[MAX_KEY_SIZE ];uint16_t auth_key_len;examples/ipsec-secgw/sa.c +29
-6@@ -77,6 +77,13 @@ const struct supported_cipher_algo cipher_algos[] = { .key_len = 16 }, { + .keyword = "aes-192-cbc", + .algo = RTE_CRYPTO_CIPHER_AES_CBC, + .iv_len = 16, + .block_size = 16, + .key_len =24 + }, + { .keyword = "aes-256-cbc", .algo = RTE_CRYPTO_CIPHER_AES_CBC, .iv_len = 16,@@ -127,7 +134,25 @@ const struct supported_aead_algo aead_algos[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .iv_len = 8, .block_size = 4, - .key_len = 20, + .key_len = 16, + .digest_len = 16, + .aad_len = 8, + }, + { + .keyword = "aes-192-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 24, + .digest_len = 16, + .aad_len = 8, + }, + { + .keyword = "aes-256-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 32, .digest_len = 16, .aad_len = 8, }@@ -495,16 +520,14 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,return ; key_len =parse_key_string (tokens[ti], - rule->cipher_key); + rule->cipher_key) -SALT_SIZE ;APP_CHECK (key_len == rule->cipher_key_len, status,"unrecognized input \"%s\"" , tokens[ti]);if (status->status <0 )return ; - key_len -=4 ; - rule->cipher_key_len = key_len; -memcpy (&rule->salt, - &rule->cipher_key[key_len],4 ); +memcpy (&rule->salt, &rule->cipher_key[key_len], +SALT_SIZE ); aead_algo_p =1 ;continue ;@@ -751,7 +774,8 @@ print_one_sa_rule(const struct ipsec_sa *sa, intinbound)
Quoted 11 lines
examples/ipsec-secgw/sa.c +2
-2}for (i =0 ; i <RTE_DIM (aead_algos); i++) { -if (aead_algos[i].algo == sa->aead_algo) { +if (aead_algos[i].algo == sa->aead_algo && + aead_algos[i].key_len == sa->cipher_key_len) {printf ("%s " , aead_algos[i].keyword);break ; } --2.7.4
Quoted 59 lines
Quoted 18 lines
Hi Anoob,
Quoted 6 lines
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBCQuoted 6 lines
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Tejasree Kondoj <[email protected]>---
v3:
* Fixed incorrect AES-GCM key length being printed during app startup
* Introduced new macro 'SALT_SIZE' to make the usage more obvious (AES-GCM
Quoted 2 lines
key has key following 4 byte salt)
* Minor cleanup for the existing code.Quoted 8 lines
I believe GCM keys are extended by 4 bytes to include the SALT value in many apps.
We may add a comment that it is including the SALT value, but it makes more confusing now.The length which is being printed is 16Bytes but we expect the user to have 20Bytes In the ep0.cfg file. This will be confusing also to configure the packet capturing APPs Like wireshark which accepts 20Byte keys in case of GCM.
[Anoob] The ones I've edited is just internal data structures. These are not exposed and not directly printed anywhere.
spi_in( 51):aes-128-gcm mode:IP4Tunnel 10.0.10.1 10.0.10.2 type:inline- protocol-offloadspi_in( 52):aes-192-gcm mode:IP4Tunnel 10.0.20.1 10.0.20.2 type:inline- protocol-offloadspi_in( 53):aes-256-gcm mode:IP4Tunnel 10.0.30.1 10.0.30.2 type:inline- protocol-offloadAlso, my initial patch didn't try to address this aspect. In that patch, I had the following addition, in which key length was clearly not matching the string.
{ .keyword = "aes-192-gcm", .algo = RTE_CRYPTO_AEAD_AES_GCM, .iv_len = 8, .block_size = 4, .key_len = 28, .digest_len = 16, .aad_len = 8, },In either case, the "misleading" part in config file would stay as the string would be "aes-128-gcm"/"aes-192-gcm"/"aes-256-gcm", and the key specified will have additional 4 bytes. Please do comment inline on what you think is the right approach. You can check if you are fine with v2 approach. I can resend that with a minor change required in the print.
One more thing. I was just checking the ipsec-secgw documentation of AEAD keys. I think we need to update that as well.
Quoted 7 lines
Syntax: Hexadecimal bytes (0x0-0xFF) concatenate by colon symbol ':'. The number of bytes should be as same as the specified AEAD algorithm key size.
For example:
aead_keyA1:B2:C3:D4:A1:B2:C3:D4:A1:B2:C3:D4: A1:B2:C3:D4Can you advice on what should be the approach here?
I think it is better to have the key len include the 4 bytes of SALT and cfg file has those 4 bytes Inline with the key. We can add a print to specify that last 4 bytes are salt.
And Yes for AEAD doc, we can add a statement that keylen should include the the 4bytes of SALT. And user should specify the extra 4 bytes.
So I believe your v2 was good enough with some additional documentations.
Hi Akhil,
Please see inline.
Thanks,
Anoob
Quoted 83 lines
-----Original Message-----
From: Akhil Goyal <[email protected]>
Sent: Monday, April 6, 2020 12:12 PM
To: Anoob Joseph <[email protected]>; Radu Nicolau <[email protected]>
Cc: Narayana Prasad Raju Athreya <[email protected]>; Tejasree Kondoj <[email protected]>; [email protected]
Subject: [EXT] RE: [PATCH v3] examples/ipsec-secgw: support 192/256 AES key sizesExternal Email
----------------------------------------------------------------------
Quoted 20 lines
Quoted 20 lines
Hi Anoob,
Quoted 6 lines
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBCQuoted 8 lines
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Tejasree Kondoj <[email protected]>---
v3:
* Fixed incorrect AES-GCM key length being printed during app startup
* Introduced new macro 'SALT_SIZE' to make the usage more obvious (AES-GCM
Quoted 2 lines
key has key following 4 byte salt)
* Minor cleanup for the existing code.Quoted 8 lines
Quoted 8 lines
I believe GCM keys are extended by 4 bytes to include the SALT value in many apps.
We may add a comment that it is including the SALT value, but it makes more confusing now.The length which is being printed is 16Bytes but we expect the user to have 20Bytes In the ep0.cfg file. This will be confusing also to configure the packet capturing APPs Like wireshark which accepts 20Byte
keys in case of GCM.
Quoted 4 lines
[Anoob] The ones I've edited is just internal data structures. These are not exposed and not directly printed anywhere.
Quoted 8 lines
spi_in( 51):aes-128-gcm mode:IP4Tunnel 10.0.10.1 10.0.10.2 type:inline- protocol-offloadspi_in( 52):aes-192-gcm mode:IP4Tunnel 10.0.20.1 10.0.20.2 type:inline- protocol-offloadspi_in( 53):aes-256-gcm mode:IP4Tunnel 10.0.30.1 10.0.30.2 type:inline- protocol-offloadAlso, my initial patch didn't try to address this aspect. In that patch, I had the following addition, in which key length was clearly not
matching the string.
Quoted 17 lines
{ .keyword = "aes-192-gcm", .algo = RTE_CRYPTO_AEAD_AES_GCM, .iv_len = 8, .block_size = 4, .key_len = 28, .digest_len = 16, .aad_len = 8, },In either case, the "misleading" part in config file would stay as the string would be "aes-128-gcm"/"aes-192-gcm"/"aes-256-gcm", and the key specified will have additional 4 bytes. Please do comment inline on what you think is the right approach. You can check if you are fine with v2 approach. I can resend that with a minor change required in the print.
Quoted 5 lines
One more thing. I was just checking the ipsec-secgw documentation of AEAD keys. I think we need to update that as well.
Syntax: Hexadecimal bytes (0x0-0xFF) concatenate by colon symbol ':'. The number of bytes should be as same as the specified AEAD algorithm key
size.
Quoted 5 lines
For example:
aead_keyA1:B2:C3:D4:A1:B2:C3:D4:A1:B2:C3:D4: A1:B2:C3:D4Can you advice on what should be the approach here?
Quoted 8 lines
I think it is better to have the key len include the 4 bytes of SALT and cfg file has those 4 bytes Inline with the key. We can add a print to specify that last 4 bytes are salt.
And Yes for AEAD doc, we can add a statement that keylen should include the the 4bytes of SALT.
And user should specify the extra 4 bytes.So I believe your v2 was good enough with some additional documentations.
[Anoob] Will submit v2 with the changes discussed.
PATCH v4 1/1 examples/ipsec-secgw: support 192/256 AES key sizes
In reply to Anoob JosephAdding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBC
---
v4:
* Reverted to v2 as suggested by Akhil.
* Added additional check in print routines to make sure correct key size is printed.
* Updated incorrect documentation of 'aead_key'
v3:
* Fixed incorrect AES-GCM key length being printed during app startup
* Introduced new macro 'SALT_SIZE' to make the usage more obvious (AES-GCM key has key following 4 byte salt)
* Minor cleanup for the existing code.
v2:
* Updated doc and release notes
doc/guides/rel_notes/release_20_05.rst | 7 +++++++ doc/guides/sample_app_ug/ipsec_secgw.rst | 10 +++++++--- examples/ipsec-secgw/ipsec.h | 2 +- examples/ipsec-secgw/sa.c | 28 +++++++++++++++++++++++++++- 4 files changed, 42 insertions(+), 5 deletions(-)
doc/guides/rel_notes/release_20_05.rst +7 -0
@@ -81,6 +81,13 @@ New Features by making use of the event device capabilities. The event mode currently supports only inline IPsec protocol offload. +* **Added 192/256 AES key sizes in ipsec-secgw application.** + + Updated ipsec-secgw application to support the following key sizes, + - AES-192-CBC + - AES-192-GCM + - AES-256-GCM + Removed Items -------------
doc/guides/sample_app_ug/ipsec_secgw.rst +7 -3
@@ -538,6 +538,7 @@ where each options means: * *null*: NULL algorithm * *aes-128-cbc*: AES-CBC 128-bit algorithm + * *aes-192-cbc*: AES-CBC 192-bit algorithm * *aes-256-cbc*: AES-CBC 256-bit algorithm * *aes-128-ctr*: AES-CTR 128-bit algorithm * *3des-cbc*: 3DES-CBC 192-bit algorithm
@@ -593,6 +594,8 @@ where each options means: * Available options: * *aes-128-gcm*: AES-GCM 128-bit algorithm + * *aes-192-gcm*: AES-GCM 192-bit algorithm + * *aes-256-gcm*: AES-GCM 256-bit algorithm * Syntax: *cipher_algo <your algorithm>*
@@ -604,11 +607,12 @@ where each options means: Must be followed by <aead_algo> option * Syntax: Hexadecimal bytes (0x0-0xFF) concatenate by colon symbol ':'. - The number of bytes should be as same as the specified AEAD algorithm - key size. + Last 4 bytes of the provided key will be used as 'salt' and so, the + number of bytes should be same as the sum of specified AEAD algorithm + key size and salt size (4 bytes). For example: *aead_key A1:B2:C3:D4:A1:B2:C3:D4:A1:B2:C3:D4: - A1:B2:C3:D4* + A1:B2:C3:D4:A1:B2:C3:D4* ``<mode>``
examples/ipsec-secgw/ipsec.h +1 -1
@@ -72,7 +72,7 @@ struct ip_addr { } ip; }; -#define MAX_KEY_SIZE 32 +#define MAX_KEY_SIZE 36/* * application wide SA parameters
examples/ipsec-secgw/sa.c +27 -1
@@ -77,6 +77,13 @@ const struct supported_cipher_algo cipher_algos[] = { .key_len = 16 }, { + .keyword = "aes-192-cbc", + .algo = RTE_CRYPTO_CIPHER_AES_CBC, + .iv_len = 16, + .block_size = 16, + .key_len =24 + }, + { .keyword = "aes-256-cbc", .algo = RTE_CRYPTO_CIPHER_AES_CBC, .iv_len = 16,
@@ -130,6 +137,24 @@ const struct supported_aead_algo aead_algos[] = { .key_len = 20, .digest_len = 16, .aad_len = 8, + }, + { + .keyword = "aes-192-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 28, + .digest_len = 16, + .aad_len = 8, + }, + { + .keyword = "aes-256-gcm", + .algo = RTE_CRYPTO_AEAD_AES_GCM, + .iv_len = 8, + .block_size = 4, + .key_len = 36, + .digest_len = 16, + .aad_len = 8, } };
@@ -753,7 +778,8 @@ print_one_sa_rule(const struct ipsec_sa *sa, int inbound) }for (i =0 ; i <RTE_DIM (aead_algos); i++) { -if (aead_algos[i].algo == sa->aead_algo) { +if (aead_algos[i].algo == sa->aead_algo && + aead_algos[i].key_len-4 == sa->cipher_key_len) {printf ("%s " , aead_algos[i].keyword);break ; }
Signature · 1 line
2.7.4
Quoted 11 lines
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBCSigned-off-by Anoob Joseph <[email protected]>Signed-off-by Tejasree Kondoj <[email protected]>---
Akhil Goyal
AppliedQuoted 8 lines
Quoted 8 lines
Adding support for the following,
1. AES-192-GCM
2. AES-256-GCM
3. AES-192-CBC
Quoted 5 lines
Quoted 4 lines
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Tejasree Kondoj <[email protected]>---
Acked-by Akhil Goyal <[email protected]>
Applied to dpdk-next-crypto
Thanks.