diff options
Diffstat (limited to 'src/crypto_engines')
| -rw-r--r-- | src/crypto_engines/ipsecmb/ipsecmb.c | 8 | ||||
| -rw-r--r-- | src/crypto_engines/native/main.c | 2 | ||||
| -rw-r--r-- | src/crypto_engines/native/sha2.c | 2 | ||||
| -rw-r--r-- | src/crypto_engines/openssl/main.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/crypto_engines/ipsecmb/ipsecmb.c b/src/crypto_engines/ipsecmb/ipsecmb.c index 256856bed8c..0aeefaecebd 100644 --- a/src/crypto_engines/ipsecmb/ipsecmb.c +++ b/src/crypto_engines/ipsecmb/ipsecmb.c @@ -754,7 +754,7 @@ crypto_ipsecmb_key_handler (vnet_crypto_key_op_t kop, void *kd; /** TODO: add linked alg support **/ - if (key->type == VNET_CRYPTO_KEY_TYPE_LINK) + if (key->is_link) return; if (kop == VNET_CRYPTO_KEY_OP_DEL) @@ -805,10 +805,10 @@ crypto_ipsecmb_key_handler (vnet_crypto_key_op_t kop, u64 pad[block_qw], key_hash[block_qw]; clib_memset_u8 (key_hash, 0, HMAC_MAX_BLOCK_SIZE); - if (vec_len (key->data) <= ad->block_size) - clib_memcpy_fast (key_hash, key->data, vec_len (key->data)); + if (key->length <= ad->block_size) + clib_memcpy_fast (key_hash, key->data, key->length); else - ad->hash_fn (key->data, vec_len (key->data), key_hash); + ad->hash_fn (key->data, key->length, key_hash); for (i = 0; i < block_qw; i++) pad[i] = key_hash[i] ^ 0x3636363636363636; diff --git a/src/crypto_engines/native/main.c b/src/crypto_engines/native/main.c index e9e71b6fb6d..193b7a51c10 100644 --- a/src/crypto_engines/native/main.c +++ b/src/crypto_engines/native/main.c @@ -19,7 +19,7 @@ crypto_native_key_handler (vnet_crypto_key_op_t kop, crypto_native_main_t *cm = &crypto_native_main; /** TODO: add linked alg support **/ - if (key->type == VNET_CRYPTO_KEY_TYPE_LINK) + if (key->is_link) return; if (cm->key_fn[key->alg] == 0) diff --git a/src/crypto_engines/native/sha2.c b/src/crypto_engines/native/sha2.c index b61a5f08060..46a71b5b327 100644 --- a/src/crypto_engines/native/sha2.c +++ b/src/crypto_engines/native/sha2.c @@ -110,7 +110,7 @@ sha2_key_add (vnet_crypto_key_t *key, clib_sha2_type_t type) clib_sha2_hmac_key_data_t *kd; kd = clib_mem_alloc_aligned (sizeof (*kd), CLIB_CACHE_LINE_BYTES); - clib_sha2_hmac_key_data (type, key->data, vec_len (key->data), kd); + clib_sha2_hmac_key_data (type, key->data, key->length, kd); return kd; } diff --git a/src/crypto_engines/openssl/main.c b/src/crypto_engines/openssl/main.c index c5636add266..cfb2a5e0568 100644 --- a/src/crypto_engines/openssl/main.c +++ b/src/crypto_engines/openssl/main.c @@ -494,7 +494,7 @@ openssl_ctx_hmac (vnet_crypto_key_t *key, vnet_crypto_key_op_t kop, vec_validate_aligned (ptd->hmac_ctx, idx, CLIB_CACHE_LINE_BYTES); #if OPENSSL_VERSION_NUMBER >= 0x10100000L ctx = HMAC_CTX_new (); - HMAC_Init_ex (ctx, key->data, vec_len (key->data), md, NULL); + HMAC_Init_ex (ctx, key->data, key->length, md, NULL); ptd->hmac_ctx[idx] = ctx; #else HMAC_CTX_init (&(ptd->_hmac_ctx)); @@ -507,7 +507,7 @@ openssl_ctx_hmac (vnet_crypto_key_t *key, vnet_crypto_key_op_t kop, for (ptd = per_thread_data; ptd - per_thread_data < num_threads; ptd++) { ctx = ptd->hmac_ctx[idx]; - HMAC_Init_ex (ctx, key->data, vec_len (key->data), md, NULL); + HMAC_Init_ex (ctx, key->data, key->length, md, NULL); } } else if (VNET_CRYPTO_KEY_OP_DEL == kop) @@ -530,7 +530,7 @@ crypto_openssl_key_handler (vnet_crypto_key_op_t kop, crypto_openssl_main_t *cm = &crypto_openssl_main; /** TODO: add linked alg support **/ - if (key->type == VNET_CRYPTO_KEY_TYPE_LINK) + if (key->is_link) return; if (cm->ctx_fn[key->alg] == 0) |