examples/ipsec-secgw: support additional algorithms

Add support for AES-GMAC, AES_CTR, AES_XCBC_MAC,
AES_CCM, CHACHA20_POLY1305

Signed-off-by: Declan Doherty <declan.doherty@intel.com>
Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>

diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
index 7a9025e8de9da332c0d23740b7dd32d6614e1919..eefb18d0c09fb6e319125d26ee1a2008b8f2234f 100644 (file)
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -358,6 +358,8 @@ New Features
 
   * Added support for TSO (only for inline crypto TCP packets).
   * Added support for telemetry.
+  * Added support for more AEAD algorithms: AES-GMAC, AES_CTR, AES_XCBC_MAC,
+    AES_CCM, CHACHA20_POLY1305
 
 * **Revised packet capture framework.**
 

diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst
index 299b22a8cb5d58056d861ac3f65284ace1404046..c7670440b0346fd89826f1ed1070ea4cb3787704 100644 (file)
--- a/doc/guides/sample_app_ug/ipsec_secgw.rst
+++ b/doc/guides/sample_app_ug/ipsec_secgw.rst
@@ -106,7 +106,8 @@ Constraints
 
 *  No IPv6 options headers.
 *  No AH mode.
-*  Supported algorithms: AES-CBC, AES-CTR, AES-GCM, 3DES-CBC, HMAC-SHA1 and NULL.
+*  Supported algorithms: AES-CBC, AES-CTR, AES-GCM, 3DES-CBC, HMAC-SHA1,
+   AES-GMAC, AES_CTR, AES_XCBC_MAC, AES_CCM, CHACHA20_POLY1305 and NULL.
 *  Each SA must be handle by a unique lcore (*1 RX queue per port*).
 
 Compiling the Application

diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index 0d7d5edb9ac312a4442d5e64c585e38b81c0152d..bc87b1a51d0ff175679cb31a67e26c9a563842f1 100644 (file)
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -63,8 +63,7 @@ struct ip_addr {
        } ip;
 };
 
-#define MAX_KEY_SIZE           36
-
+#define MAX_KEY_SIZE           64
 /*
  * application wide SA parameters
  */

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 9005e4e01d8c6426c6847b77e56a925159a229e1..30bc693e064af8a003a497bd112924ae297d6dc9 100644 (file)
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -46,6 +46,7 @@ struct supported_cipher_algo {
 struct supported_auth_algo {
        const char *keyword;
        enum rte_crypto_auth_algorithm algo;
+       uint16_t iv_len;
        uint16_t digest_len;
        uint16_t key_len;
        uint8_t key_not_req;
@@ -98,6 +99,20 @@ const struct supported_cipher_algo cipher_algos[] = {
                .block_size = 4,
                .key_len = 20
        },
+       {
+               .keyword = "aes-192-ctr",
+               .algo = RTE_CRYPTO_CIPHER_AES_CTR,
+               .iv_len = 16,
+               .block_size = 16,
+               .key_len = 28
+       },
+       {
+               .keyword = "aes-256-ctr",
+               .algo = RTE_CRYPTO_CIPHER_AES_CTR,
+               .iv_len = 16,
+               .block_size = 16,
+               .key_len = 36
+       },
        {
                .keyword = "3des-cbc",
                .algo = RTE_CRYPTO_CIPHER_3DES_CBC,
@@ -126,6 +141,31 @@ const struct supported_auth_algo auth_algos[] = {
                .algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
                .digest_len = 16,
                .key_len = 32
+       },
+       {
+               .keyword = "sha384-hmac",
+               .algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
+               .digest_len = 24,
+               .key_len = 48
+       },
+       {
+               .keyword = "sha512-hmac",
+               .algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
+               .digest_len = 32,
+               .key_len = 64
+       },
+       {
+               .keyword = "aes-gmac",
+               .algo = RTE_CRYPTO_AUTH_AES_GMAC,
+               .iv_len = 8,
+               .digest_len = 16,
+               .key_len = 20
+       },
+       {
+               .keyword = "aes-xcbc-mac-96",
+               .algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC,
+               .digest_len = 12,
+               .key_len = 16
        }
 };
 
@@ -156,6 +196,42 @@ const struct supported_aead_algo aead_algos[] = {
                .key_len = 36,
                .digest_len = 16,
                .aad_len = 8,
+       },
+       {
+               .keyword = "aes-128-ccm",
+               .algo = RTE_CRYPTO_AEAD_AES_CCM,
+               .iv_len = 8,
+               .block_size = 4,
+               .key_len = 20,
+               .digest_len = 16,
+               .aad_len = 8,
+       },
+       {
+               .keyword = "aes-192-ccm",
+               .algo = RTE_CRYPTO_AEAD_AES_CCM,
+               .iv_len = 8,
+               .block_size = 4,
+               .key_len = 28,
+               .digest_len = 16,
+               .aad_len = 8,
+       },
+       {
+               .keyword = "aes-256-ccm",
+               .algo = RTE_CRYPTO_AEAD_AES_CCM,
+               .iv_len = 8,
+               .block_size = 4,
+               .key_len = 36,
+               .digest_len = 16,
+               .aad_len = 8,
+       },
+       {
+               .keyword = "chacha20-poly1305",
+               .algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305,
+               .iv_len = 12,
+               .block_size = 64,
+               .key_len = 36,
+               .digest_len = 16,
+               .aad_len = 8,
        }
 };
 
@@ -484,6 +560,14 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
                        if (status->status < 0)
                                return;
 
+                       if (algo->algo == RTE_CRYPTO_AUTH_AES_GMAC) {
+                               key_len -= 4;
+                               rule->auth_key_len = key_len;
+                               rule->iv_len = algo->iv_len;
+                               memcpy(&rule->salt,
+                                       &rule->auth_key[key_len], 4);
+                       }
+
                        auth_algo_p = 1;
                        continue;
                }
@@ -1187,8 +1271,15 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
                        break;
                }
 
-               if (sa->aead_algo == RTE_CRYPTO_AEAD_AES_GCM) {
-                       iv_length = 12;
+
+               if (sa->aead_algo == RTE_CRYPTO_AEAD_AES_GCM ||
+                       sa->aead_algo == RTE_CRYPTO_AEAD_AES_CCM ||
+                       sa->aead_algo == RTE_CRYPTO_AEAD_CHACHA20_POLY1305) {
+
+                       if (sa->aead_algo == RTE_CRYPTO_AEAD_AES_CCM)
+                               iv_length = 11;
+                       else
+                               iv_length = 12;
 
                        sa_ctx->xf[idx].a.type = RTE_CRYPTO_SYM_XFORM_AEAD;
                        sa_ctx->xf[idx].a.aead.algo = sa->aead_algo;
@@ -1212,10 +1303,8 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
                        case RTE_CRYPTO_CIPHER_NULL:
                        case RTE_CRYPTO_CIPHER_3DES_CBC:
                        case RTE_CRYPTO_CIPHER_AES_CBC:
-                               iv_length = sa->iv_len;
-                               break;
                        case RTE_CRYPTO_CIPHER_AES_CTR:
-                               iv_length = 16;
+                               iv_length = sa->iv_len;
                                break;
                        default:
                                RTE_LOG(ERR, IPSEC_ESP,
@@ -1224,6 +1313,10 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
                                return -EINVAL;
                        }
 
+                       /* AES_GMAC uses salt like AEAD algorithms */
+                       if (sa->auth_algo == RTE_CRYPTO_AUTH_AES_GMAC)
+                               iv_length = 12;
+
                        if (inbound) {
                                sa_ctx->xf[idx].b.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
                                sa_ctx->xf[idx].b.cipher.algo = sa->cipher_algo;
@@ -1245,6 +1338,9 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
                                        sa->digest_len;
                                sa_ctx->xf[idx].a.auth.op =
                                        RTE_CRYPTO_AUTH_OP_VERIFY;
+                               sa_ctx->xf[idx].a.auth.iv.offset = IV_OFFSET;
+                               sa_ctx->xf[idx].a.auth.iv.length = iv_length;
+
                        } else { /* outbound */
                                sa_ctx->xf[idx].a.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
                                sa_ctx->xf[idx].a.cipher.algo = sa->cipher_algo;
@@ -1266,11 +1362,21 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
                                        sa->digest_len;
                                sa_ctx->xf[idx].b.auth.op =
                                        RTE_CRYPTO_AUTH_OP_GENERATE;
+                               sa_ctx->xf[idx].b.auth.iv.offset = IV_OFFSET;
+                               sa_ctx->xf[idx].b.auth.iv.length = iv_length;
+
                        }
 
-                       sa_ctx->xf[idx].a.next = &sa_ctx->xf[idx].b;
-                       sa_ctx->xf[idx].b.next = NULL;
-                       sa->xforms = &sa_ctx->xf[idx].a;
+                       if (sa->auth_algo == RTE_CRYPTO_AUTH_AES_GMAC) {
+                               sa->xforms = inbound ?
+                                       &sa_ctx->xf[idx].a : &sa_ctx->xf[idx].b;
+                               sa->xforms->next = NULL;
+
+                       } else {
+                               sa_ctx->xf[idx].a.next = &sa_ctx->xf[idx].b;
+                               sa_ctx->xf[idx].b.next = NULL;
+                               sa->xforms = &sa_ctx->xf[idx].a;
+                       }
                }
 
                if (ips->type ==