crypto: add support for AEAD and AES-GCM

[vpp.git] / src / vnet / crypto / crypto.h

diff --git a/src/vnet/crypto/crypto.h b/src/vnet/crypto/crypto.h
index 2bd40dc..5d03d52 100644 (file)
--- a/src/vnet/crypto/crypto.h
+++ b/src/vnet/crypto/crypto.h
@@ -20,14 +20,19 @@
 
 #include <vlib/vlib.h>
 
-#define foreach_crypto_alg \
-  _(DES_CBC, "des-cbc") \
-  _(3DES_CBC, "3des-cbc") \
+#define foreach_crypto_cipher_alg \
+  _(DES_CBC,     "des-cbc") \
+  _(3DES_CBC,    "3des-cbc") \
   _(AES_128_CBC, "aes-128-cbc") \
   _(AES_192_CBC, "aes-192-cbc") \
   _(AES_256_CBC, "aes-256-cbc")
 
-#define foreach_hmac_alg \
+#define foreach_crypto_aead_alg \
+  _(AES_128_GCM, "aes-128-gcm") \
+  _(AES_192_GCM, "aes-192-gcm") \
+  _(AES_256_GCM, "aes-256-gcm")
+
+#define foreach_crypto_hmac_alg \
   _(MD5, "md5") \
   _(SHA1, "sha-1") \
   _(SHA224, "sha-224")  \
@@ -35,14 +40,46 @@
   _(SHA384, "sha-384")  \
   _(SHA512, "sha-512")
 
+
+#define foreach_crypto_op_type \
+  _(ENCRYPT, "encrypt") \
+  _(DECRYPT, "decrypt") \
+  _(AEAD_ENCRYPT, "aead-encrypt") \
+  _(AEAD_DECRYPT, "aead-decrypt") \
+  _(HMAC, "hmac")
+
+typedef enum
+{
+#define _(n, s) VNET_CRYPTO_OP_TYPE_##n,
+  foreach_crypto_op_type
+#undef _
+    VNET_CRYPTO_OP_N_TYPES,
+} vnet_crypto_op_type_t;
+
+#define foreach_crypto_op_status \
+  _(PENDING, "pending") \
+  _(COMPLETED, "completed") \
+  _(FAIL_NO_HANDLER, "no-handler") \
+  _(FAIL_BAD_HMAC, "bad-hmac") \
+  _(FAIL_DECRYPT, "decrypt-fail")
+
+typedef enum
+{
+#define _(n, s) VNET_CRYPTO_OP_STATUS_##n,
+  foreach_crypto_op_status
+#undef _
+    VNET_CRYPTO_OP_N_STATUS,
+} vnet_crypto_op_status_t;
+
 /* *INDENT-OFF* */
 typedef enum
 {
 #define _(n, s) VNET_CRYPTO_ALG_##n,
-  foreach_crypto_alg
+  foreach_crypto_cipher_alg
+  foreach_crypto_aead_alg
 #undef _
-#define _(n, s) VNET_CRYPTO_ALG_##n,
-  foreach_hmac_alg
+#define _(n, s) VNET_CRYPTO_ALG_HMAC_##n,
+  foreach_crypto_hmac_alg
 #undef _
   VNET_CRYPTO_N_ALGS,
 } vnet_crypto_alg_t;
@@ -51,68 +88,54 @@ typedef enum
 {
   VNET_CRYPTO_OP_NONE = 0,
 #define _(n, s) VNET_CRYPTO_OP_##n##_ENC, VNET_CRYPTO_OP_##n##_DEC,
-  foreach_crypto_alg
+  foreach_crypto_cipher_alg
+  foreach_crypto_aead_alg
 #undef _
 #define _(n, s) VNET_CRYPTO_OP_##n##_HMAC,
-  foreach_hmac_alg
+ foreach_crypto_hmac_alg
 #undef _
-    VNET_CRYPTO_N_OP_TYPES,
-} vnet_crypto_op_type_t;
+    VNET_CRYPTO_N_OP_IDS,
+} vnet_crypto_op_id_t;
 /* *INDENT-ON* */
 
 typedef struct
 {
   char *name;
+  vnet_crypto_op_id_t op_by_type[VNET_CRYPTO_OP_N_TYPES];
 } vnet_crypto_alg_data_t;
 
-typedef enum
-{
-  VNET_CRYPTO_OP_STATUS_PENDING,
-  VNET_CRYPTO_OP_STATUS_COMPLETED,
-  VNET_CRYPTO_OP_STATUS_FAIL_NO_HANDLER,
-  VNET_CRYPTO_OP_STATUS_FAIL_BAD_HMAC,
-} vnet_crypto_op_status_t;
-
 typedef struct
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  vnet_crypto_op_type_t op:8;
+  vnet_crypto_op_id_t op:16;
   vnet_crypto_op_status_t status:8;
-  u8 key_len, hmac_trunc_len;
-  u16 flags;
+  u8 flags;
 #define VNET_CRYPTO_OP_FLAG_INIT_IV (1 << 0)
 #define VNET_CRYPTO_OP_FLAG_HMAC_CHECK (1 << 1)
   u32 len;
+  u16 aad_len;
+  u8 key_len, iv_len, digest_len, tag_len;
   u8 *key;
   u8 *iv;
   u8 *src;
   u8 *dst;
+  u8 *aad;
+  u8 *tag;
+  u8 *digest;
   uword user_data;
 } vnet_crypto_op_t;
 
 typedef struct
 {
+  vnet_crypto_op_type_t type;
   vnet_crypto_alg_t alg;
-  const char *desc;
   u32 active_engine_index;
-} vnet_crypto_op_type_data_t;
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  u32 head;
-  u32 tail;
-  u32 size;
-  vnet_crypto_alg_t alg:8;
-  vnet_crypto_op_type_t op:8;
-  vnet_crypto_op_t *jobs[0];
-} vnet_crypto_queue_t;
+} vnet_crypto_op_data_t;
 
 typedef struct
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   clib_bitmap_t *act_queues;
-  vnet_crypto_queue_t *queues[VNET_CRYPTO_N_OP_TYPES];
 } vnet_crypto_thread_t;
 
 typedef u32 (vnet_crypto_ops_handler_t) (vlib_main_t * vm,
@@ -123,7 +146,7 @@ u32 vnet_crypto_register_engine (vlib_main_t * vm, char *name, int prio,
 
 vlib_error_t *vnet_crypto_register_ops_handler (vlib_main_t * vm,
                                                u32 provider_index,
-                                               vnet_crypto_op_type_t opt,
+                                               vnet_crypto_op_id_t opt,
                                                vnet_crypto_ops_handler_t *
                                                f);
 
@@ -132,7 +155,7 @@ typedef struct
   char *name;
   char *desc;
   int priority;
-  vnet_crypto_ops_handler_t *ops_handlers[VNET_CRYPTO_N_OP_TYPES];
+  vnet_crypto_ops_handler_t *ops_handlers[VNET_CRYPTO_N_OP_IDS];
 } vnet_crypto_engine_t;
 
 typedef struct
@@ -140,10 +163,10 @@ typedef struct
   vnet_crypto_alg_data_t *algs;
   vnet_crypto_thread_t *threads;
   vnet_crypto_ops_handler_t **ops_handlers;
-  vnet_crypto_op_type_data_t opt_data[VNET_CRYPTO_N_OP_TYPES];
+  vnet_crypto_op_data_t opt_data[VNET_CRYPTO_N_OP_IDS];
   vnet_crypto_engine_t *engines;
   uword *engine_index_by_name;
-  uword *ops_handler_index_by_name;
+  uword *alg_index_by_name;
 } vnet_crypto_main_t;
 
 extern vnet_crypto_main_t crypto_main;
@@ -160,10 +183,11 @@ int vnet_crypto_set_handler (char *ops_handler_name, char *engine);
 format_function_t format_vnet_crypto_alg;
 format_function_t format_vnet_crypto_engine;
 format_function_t format_vnet_crypto_op;
-
+format_function_t format_vnet_crypto_op_type;
+format_function_t format_vnet_crypto_op_status;
 
 static_always_inline void
-vnet_crypto_op_init (vnet_crypto_op_t * op, vnet_crypto_op_type_t type)
+vnet_crypto_op_init (vnet_crypto_op_t * op, vnet_crypto_op_id_t type)
 {
   if (CLIB_DEBUG > 0)
     clib_memset (op, 0xfe, sizeof (*op));
@@ -171,6 +195,14 @@ vnet_crypto_op_init (vnet_crypto_op_t * op, vnet_crypto_op_type_t type)
   op->flags = 0;
 }
 
+static_always_inline vnet_crypto_op_type_t
+vnet_crypto_get_op_type (vnet_crypto_op_id_t id)
+{
+  vnet_crypto_main_t *cm = &crypto_main;
+  vnet_crypto_op_data_t *od = vec_elt_at_index (cm->opt_data, id);
+  return od->type;
+}
+
 #endif /* included_vnet_crypto_crypto_h */
 
 /*