diff options
| author |   Damjan Marion <damarion@cisco.com> | 2025-01-10 18:53:23 +0000 |
|---|---|---|
| committer |   Ole Tr�an <otroan@employees.org> | 2025-01-13 12:21:15 +0000 |
| commit | 1f7c4e2e6ced5672f3ce398a5e8bcdfd45adc5de (patch) | |
| tree | c71cbe22d983a592826364daf38f280c0daba253 /src/vnet | |
| parent | b647193cdae84d443c11a33056b875571575d56f (diff) | |
crypto: remove AEAD opt types
Type: improvement
Change-Id: I32ccf1d58a34bc6f64946ffd711dbd2b4f5864f6
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/crypto/crypto.c | 20 | ||||
| -rw-r--r-- | src/vnet/crypto/crypto.h | 3 |
2 files changed, 6 insertions, 17 deletions
diff --git a/src/vnet/crypto/crypto.c b/src/vnet/crypto/crypto.c index ff6b42a4382..396b8d4ca6a 100644 --- a/src/vnet/crypto/crypto.c +++ b/src/vnet/crypto/crypto.c @@ -669,29 +669,19 @@ static void vnet_crypto_init_cipher_data (vnet_crypto_alg_t alg, vnet_crypto_op_id_t eid, vnet_crypto_op_id_t did, char *name, u8 is_aead) { - vnet_crypto_op_type_t eopt, dopt; vnet_crypto_main_t *cm = &crypto_main; cm->algs[alg].name = name; + cm->algs[alg].is_aead = is_aead; cm->opt_data[eid].alg = cm->opt_data[did].alg = alg; cm->opt_data[eid].active_engine_index_simple = ~0; cm->opt_data[did].active_engine_index_simple = ~0; cm->opt_data[eid].active_engine_index_chained = ~0; cm->opt_data[did].active_engine_index_chained = ~0; - if (is_aead) - { - eopt = VNET_CRYPTO_OP_TYPE_AEAD_ENCRYPT; - dopt = VNET_CRYPTO_OP_TYPE_AEAD_DECRYPT; - } - else - { - eopt = VNET_CRYPTO_OP_TYPE_ENCRYPT; - dopt = VNET_CRYPTO_OP_TYPE_DECRYPT; - } - cm->opt_data[eid].type = eopt; - cm->opt_data[did].type = dopt; - cm->algs[alg].op_by_type[eopt] = eid; - cm->algs[alg].op_by_type[dopt] = did; + cm->opt_data[eid].type = VNET_CRYPTO_OP_TYPE_ENCRYPT; + cm->opt_data[did].type = VNET_CRYPTO_OP_TYPE_DECRYPT; + cm->algs[alg].op_by_type[VNET_CRYPTO_OP_TYPE_ENCRYPT] = eid; + cm->algs[alg].op_by_type[VNET_CRYPTO_OP_TYPE_DECRYPT] = did; hash_set_mem (cm->alg_index_by_name, name, alg); } diff --git a/src/vnet/crypto/crypto.h b/src/vnet/crypto/crypto.h index a0e7c261149..daaff8e0333 100644 --- a/src/vnet/crypto/crypto.h +++ b/src/vnet/crypto/crypto.h @@ -60,8 +60,6 @@ #define foreach_crypto_op_type \ _ (ENCRYPT, "encrypt") \ _ (DECRYPT, "decrypt") \ - _ (AEAD_ENCRYPT, "aead-encrypt") \ - _ (AEAD_DECRYPT, "aead-decrypt") \ _ (HMAC, "hmac") \ _ (HASH, "hash") @@ -250,6 +248,7 @@ typedef enum typedef struct { char *name; + u8 is_aead : 1; vnet_crypto_op_id_t op_by_type[VNET_CRYPTO_OP_N_TYPES]; } vnet_crypto_alg_data_t; |