Change-Id: I9db1b74097c9df587b9265b14a969d347bcb731a
Signed-off-by: Damjan Marion <damarion@cisco.com>
vm->thread_index);
int rounds = AESNI_KEY_ROUNDS (ks);
u8 dummy[8192];
vm->thread_index);
int rounds = AESNI_KEY_ROUNDS (ks);
u8 dummy[8192];
- u8 *src[4], *dst[4], *key[4];
+ u8 *src[4] = { };
+ u8 *dst[4] = { };
+ u8 *key[4] = { };
u32x4 dummy_mask, len = { };
u32 i, j, count, n_left = n_ops;
u32x4 dummy_mask, len = { };
u32 i, j, count, n_left = n_ops;
- __m128i r[4], k[4][rounds + 1];
+ __m128i r[4] = { }, k[4][rounds + 1];
more:
for (i = 0; i < 4; i++)
more:
for (i = 0; i < 4; i++)
u32 n_ops, aesni_key_size_t ks)
{
int rounds = AESNI_KEY_ROUNDS (ks);
u32 n_ops, aesni_key_size_t ks)
{
int rounds = AESNI_KEY_ROUNDS (ks);
- u8 *last_key = 0;
- u32 i;
+ vnet_crypto_op_t *op = ops[0];
+ u32 n_left = n_ops;
+ u8 *last_key;
- for (i = 0; i < n_ops; i++)
+ ASSERT (n_ops >= 1);
+
+key_expand:
+ last_key = op->key;
+ aes_key_expand (k, op->key, ks);
+ aes_key_enc_to_dec (k, ks);
+
+decrypt:
+ aes_cbc_dec (k, op->src, op->dst, op->iv, op->len, rounds);
+ op->status = VNET_CRYPTO_OP_STATUS_COMPLETED;
+
+ if (--n_left)
- vnet_crypto_op_t *op = ops[i];
- {
- aes_key_expand (k, op->key, ks);
- last_key = op->key;
- aes_key_enc_to_dec (k, rounds);
- }
- aes_cbc_dec (k, op->src, op->dst, op->iv, op->len, rounds);
- op->status = VNET_CRYPTO_OP_STATUS_COMPLETED;
+ goto key_expand;
+ goto decrypt;
{
for (int i = 0; i < 4; i++)
{
{
for (int i = 0; i < 4; i++)
{
- if (read(fd, ptd->cbc_iv, sizeof (ptd->cbc_iv)) < 0)
+ if (read(fd, ptd->cbc_iv, sizeof (ptd->cbc_iv)) !=
+ sizeof (ptd->cbc_iv))
{
err = clib_error_return_unix (0, "'/dev/urandom' read failure");
goto error;
{
err = clib_error_return_unix (0, "'/dev/urandom' read failure");
goto error;
static_always_inline void
static_always_inline void
-aes_key_enc_to_dec (__m128i * k, aesni_key_size_t rounds)
+aes_key_enc_to_dec (__m128i * k, aesni_key_size_t ks)
+ int rounds = AESNI_KEY_ROUNDS (ks);
__m128i r;
r = k[rounds];
__m128i r;
r = k[rounds];
if (cm->ops_handlers[opt] == 0)
{
if (cm->ops_handlers[opt] == 0)
{
{
ops[0]->status = VNET_CRYPTO_OP_STATUS_FAIL_NO_HANDLER;
ops++;
{
ops[0]->status = VNET_CRYPTO_OP_STATUS_FAIL_NO_HANDLER;
ops++;