Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
devices: vhost: fix data offset on input
[vpp.git]
/
src
/
plugins
/
crypto_openssl
/
main.c
diff --git
a/src/plugins/crypto_openssl/main.c
b/src/plugins/crypto_openssl/main.c
index
0560f31
..
7362d6b
100644
(file)
--- a/
src/plugins/crypto_openssl/main.c
+++ b/
src/plugins/crypto_openssl/main.c
@@
-70,9
+70,15
@@
openssl_ops_enc_cbc (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops,
vnet_crypto_op_t *op = ops[i];
vnet_crypto_key_t *key = vnet_crypto_get_key (op->key_index);
int out_len;
vnet_crypto_op_t *op = ops[i];
vnet_crypto_key_t *key = vnet_crypto_get_key (op->key_index);
int out_len;
+ int iv_len;
+
+ if (op->op == VNET_CRYPTO_OP_3DES_CBC_ENC)
+ iv_len = 8;
+ else
+ iv_len = 16;
if (op->flags & VNET_CRYPTO_OP_FLAG_INIT_IV)
if (op->flags & VNET_CRYPTO_OP_FLAG_INIT_IV)
- RAND_bytes (op->iv,
16
);
+ RAND_bytes (op->iv,
iv_len
);
EVP_EncryptInit_ex (ctx, cipher, NULL, key->data, op->iv);
EVP_EncryptUpdate (ctx, op->dst, &out_len, op->src, op->len);
EVP_EncryptInit_ex (ctx, cipher, NULL, key->data, op->iv);
EVP_EncryptUpdate (ctx, op->dst, &out_len, op->src, op->len);
@@
-163,7
+169,7
@@
openssl_ops_dec_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops,
else
{
n_fail++;
else
{
n_fail++;
- op->status = VNET_CRYPTO_OP_STATUS_FAIL_
DECRYPT
;
+ op->status = VNET_CRYPTO_OP_STATUS_FAIL_
BAD_HMAC
;
}
}
return n_ops - n_fail;
}
}
return n_ops - n_fail;
@@
-232,13
+238,9
@@
crypto_openssl_init (vlib_main_t * vm)
vlib_thread_main_t *tm = vlib_get_thread_main ();
openssl_per_thread_data_t *ptd;
u8 *seed_data = 0;
vlib_thread_main_t *tm = vlib_get_thread_main ();
openssl_per_thread_data_t *ptd;
u8 *seed_data = 0;
- clib_error_t *error;
time_t t;
pid_t pid;
time_t t;
pid_t pid;
- if ((error = vlib_call_init_function (vm, vnet_crypto_init)))
- return error;
-
u32 eidx = vnet_crypto_register_engine (vm, "openssl", 50, "OpenSSL");
#define _(m, a, b) \
u32 eidx = vnet_crypto_register_engine (vm, "openssl", 50, "OpenSSL");
#define _(m, a, b) \
@@
-284,12
+286,18
@@
crypto_openssl_init (vlib_main_t * vm)
return 0;
}
return 0;
}
-VLIB_INIT_FUNCTION (crypto_openssl_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (crypto_openssl_init) =
+{
+ .runs_after = VLIB_INITS ("vnet_crypto_init"),
+};
+/* *INDENT-ON* */
+
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
- .description = "OpenSSL Crypto Engine
Plugin
",
+ .description = "OpenSSL Crypto Engine",
};
/* *INDENT-ON* */
};
/* *INDENT-ON* */