From 7c40a3837a7a256cbb61dfad15be6e910058e4ba Mon Sep 17 00:00:00 2001 From: Nathan Skrzypczak Date: Wed, 6 Nov 2019 14:12:23 +0100 Subject: hsa: Add ckpair & crypto engine in vpp_echo Type: feature * vpp echo adds and dels a cert and key pair for each run * it passes the crypto engine to be used (openssl, picotls, vpp, mbedtls) Change-Id: Iaba1de2e6abb510e6c4edbe84b2324b2f4843f26 Signed-off-by: Nathan Skrzypczak --- src/plugins/hs_apps/sapi/vpp_echo_proto_tcp.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/plugins/hs_apps/sapi/vpp_echo_proto_tcp.c') diff --git a/src/plugins/hs_apps/sapi/vpp_echo_proto_tcp.c b/src/plugins/hs_apps/sapi/vpp_echo_proto_tcp.c index 5cb3fa667e8..5b6d74b429c 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo_proto_tcp.c +++ b/src/plugins/hs_apps/sapi/vpp_echo_proto_tcp.c @@ -122,14 +122,6 @@ tcp_echo_reset_cb (session_reset_msg_t * mp, echo_session_t * s) s->session_state = ECHO_SESSION_STATE_CLOSING; } -static void -tls_echo_set_defaults_after_opts_cb () -{ - echo_main_t *em = &echo_main; - if (em->crypto_ctx_engine == CRYPTO_ENGINE_NONE) - em->crypto_ctx_engine = CRYPTO_ENGINE_OPENSSL; -} - echo_proto_cb_vft_t echo_tcp_proto_cb_vft = { .disconnected_cb = tcp_echo_disconnected_cb, .connected_cb = tcp_echo_connected_cb, @@ -146,11 +138,10 @@ echo_proto_cb_vft_t echo_tls_proto_cb_vft = { .reset_cb = tcp_echo_reset_cb, .sent_disconnect_cb = tcp_echo_sent_disconnect_cb, .cleanup_cb = tcp_echo_cleanup_cb, - .set_defaults_after_opts_cb = tls_echo_set_defaults_after_opts_cb, }; ECHO_REGISTER_PROTO (TRANSPORT_PROTO_TCP, echo_tcp_proto_cb_vft); -ECHO_REGISTER_PROTO (TRANSPORT_PROTO_TLS, echo_tcp_proto_cb_vft); +ECHO_REGISTER_PROTO (TRANSPORT_PROTO_TLS, echo_tls_proto_cb_vft); ECHO_REGISTER_PROTO (TRANSPORT_PROTO_SCTP, echo_tcp_proto_cb_vft); /* -- cgit 1.2.3-korg