X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Ftlsopenssl%2Ftls_openssl.c;h=288f0e1ae1e66c09d1eebdcdb2bc21ae0aaf99f9;hb=837826169fd51c1d2bb7703e479447f5d4ffa9a5;hp=4d4c4c3717031257968ee9b25a8096d36721d328;hpb=f8d50682cd1245f6f5ce4c846ca6f1bdc11255a6;p=vpp.git diff --git a/src/plugins/tlsopenssl/tls_openssl.c b/src/plugins/tlsopenssl/tls_openssl.c index 4d4c4c37170..288f0e1ae1e 100644 --- a/src/plugins/tlsopenssl/tls_openssl.c +++ b/src/plugins/tlsopenssl/tls_openssl.c @@ -16,6 +16,7 @@ #include #include #include + #ifdef HAVE_OPENSSL_ASYNC #include #endif @@ -26,9 +27,9 @@ #include #include -#define MAX_CRYPTO_LEN 16 +#define MAX_CRYPTO_LEN 64 -static openssl_main_t openssl_main; +openssl_main_t openssl_main; static u32 openssl_ctx_alloc (void) { @@ -42,7 +43,7 @@ openssl_ctx_alloc (void) clib_memset (*ctx, 0, sizeof (openssl_ctx_t)); (*ctx)->ctx.c_thread_index = thread_index; - (*ctx)->ctx.tls_ctx_engine = TLS_ENGINE_OPENSSL; + (*ctx)->ctx.tls_ctx_engine = CRYPTO_ENGINE_OPENSSL; (*ctx)->ctx.app_session_handle = SESSION_INVALID_HANDLE; (*ctx)->openssl_ctx_index = ctx - tm->ctx_pool[thread_index]; return ((*ctx)->openssl_ctx_index); @@ -58,6 +59,9 @@ openssl_ctx_free (tls_ctx_t * ctx) SSL_free (oc->ssl); +#ifdef HAVE_OPENSSL_ASYNC + openssl_evt_free (ctx->evt_index, ctx->c_thread_index); +#endif vec_free (ctx->srv_hostname); pool_put_index (openssl_main.ctx_pool[ctx->c_thread_index], oc->openssl_ctx_index); @@ -175,45 +179,62 @@ openssl_try_handshake_write (openssl_ctx_t * oc, session_t * tls_session) #ifdef HAVE_OPENSSL_ASYNC static int -vpp_ssl_async_process_event (tls_ctx_t * ctx, - openssl_resume_handler * handler) +openssl_check_async_status (tls_ctx_t * ctx, openssl_resume_handler * handler, + session_t * session) { openssl_ctx_t *oc = (openssl_ctx_t *) ctx; - openssl_tls_callback_t *engine_cb; + int estatus; - engine_cb = vpp_add_async_pending_event (ctx, handler); - if (engine_cb) + SSL_get_async_status (oc->ssl, &estatus); + if (estatus == ASYNC_STATUS_EAGAIN) { - SSL_set_async_callback_arg (oc->ssl, (void *) engine_cb->arg); - TLS_DBG (2, "set callback to engine %p\n", engine_cb->callback); + vpp_tls_async_update_event (ctx, 1); + } + else + { + vpp_tls_async_update_event (ctx, 0); } - return 0; -} + return 1; -/* Due to engine busy stat, VPP need to retry later */ -static int -vpp_ssl_async_retry_func (tls_ctx_t * ctx, openssl_resume_handler * handler) -{ +} - if (vpp_add_async_run_event (ctx, handler)) - return 1; +#endif - return 0; +static void +openssl_handle_handshake_failure (tls_ctx_t * ctx) +{ + session_t *app_session; + if (SSL_is_server (((openssl_ctx_t *) ctx)->ssl)) + { + /* + * Cleanup pre-allocated app session and close transport + */ + app_session = + session_get_if_valid (ctx->c_s_index, ctx->c_thread_index); + if (app_session) + { + session_free (app_session); + ctx->no_app_session = 1; + ctx->c_s_index = SESSION_INVALID_INDEX; + tls_disconnect_transport (ctx); + } + } + else + { + /* + * Also handles cleanup of the pre-allocated session + */ + tls_notify_app_connected (ctx, /* is failed */ 1); + } } -#endif - int openssl_ctx_handshake_rx (tls_ctx_t * ctx, session_t * tls_session) { openssl_ctx_t *oc = (openssl_ctx_t *) ctx; int rv = 0, err; -#ifdef HAVE_OPENSSL_ASYNC - int estatus; - openssl_resume_handler *myself; -#endif while (SSL_in_init (oc->ssl)) { @@ -222,46 +243,38 @@ openssl_ctx_handshake_rx (tls_ctx_t * ctx, session_t * tls_session) ctx->resume = 0; } else if (!openssl_try_handshake_read (oc, tls_session)) - { - break; - } - -#ifdef HAVE_OPENSSL_ASYNC - myself = openssl_ctx_handshake_rx; - vpp_ssl_async_process_event (ctx, myself); -#endif + break; rv = SSL_do_handshake (oc->ssl); err = SSL_get_error (oc->ssl, rv); - openssl_try_handshake_write (oc, tls_session); + #ifdef HAVE_OPENSSL_ASYNC if (err == SSL_ERROR_WANT_ASYNC) { - SSL_get_async_status (oc->ssl, &estatus); - - if (estatus == ASYNC_STATUS_EAGAIN) - { - vpp_ssl_async_retry_func (ctx, myself); - } + openssl_check_async_status (ctx, openssl_ctx_handshake_rx, + tls_session); } #endif - - if (err != SSL_ERROR_WANT_WRITE) + if (err == SSL_ERROR_SSL) { - if (err == SSL_ERROR_SSL) - { - char buf[512]; - ERR_error_string (ERR_get_error (), buf); - clib_warning ("Err: %s", buf); - } - break; + char buf[512]; + ERR_error_string (ERR_get_error (), buf); + clib_warning ("Err: %s", buf); + + openssl_handle_handshake_failure (ctx); + return -1; } + + openssl_try_handshake_write (oc, tls_session); + + if (err != SSL_ERROR_WANT_WRITE) + break; } TLS_DBG (2, "tls state for %u is %s", oc->openssl_ctx_index, SSL_state_string_long (oc->ssl)); if (SSL_in_init (oc->ssl)) - return 0; + return -1; /* * Handshake complete @@ -289,7 +302,11 @@ openssl_ctx_handshake_rx (tls_ctx_t * ctx, session_t * tls_session) } else { - tls_notify_app_accept (ctx); + /* Need to check transport status */ + if (ctx->is_passive_close) + openssl_handle_handshake_failure (ctx); + else + tls_notify_app_accept (ctx); } TLS_DBG (1, "Handshake for %u complete. TLS cipher is %s", @@ -297,6 +314,13 @@ openssl_ctx_handshake_rx (tls_ctx_t * ctx, session_t * tls_session) return rv; } +static void +openssl_confirm_app_close (tls_ctx_t * ctx) +{ + tls_disconnect_transport (ctx); + session_transport_closed_notify (&ctx->connection); +} + static inline int openssl_ctx_write (tls_ctx_t * ctx, session_t * app_session) { @@ -333,7 +357,7 @@ openssl_ctx_write (tls_ctx_t * ctx, session_t * app_session) } } - if (svm_fifo_needs_tx_ntf (app_session->tx_fifo, wrote)) + if (svm_fifo_needs_deq_ntf (app_session->tx_fifo, wrote)) session_dequeue_notify (app_session); if (wrote < deq_max) @@ -374,6 +398,8 @@ check_tls_fifo: if (BIO_ctrl_pending (oc->rbio) > 0) tls_add_vpp_q_builtin_tx_evt (app_session); + else if (ctx->app_closed) + openssl_confirm_app_close (ctx); return wrote; } @@ -389,8 +415,10 @@ openssl_ctx_read (tls_ctx_t * ctx, session_t * tls_session) if (PREDICT_FALSE (SSL_in_init (oc->ssl))) { - openssl_ctx_handshake_rx (ctx, tls_session); - return 0; + if (openssl_ctx_handshake_rx (ctx, tls_session) < 0) + return 0; + else + goto check_app_fifo; } f = tls_session->rx_fifo; @@ -444,7 +472,7 @@ check_app_fifo: return wrote; } svm_fifo_enqueue_nocopy (f, read); - if (read < enq_max && BIO_ctrl_pending (oc->wbio) > 0) + if (read < enq_max && SSL_pending (oc->ssl) > 0) { deq_now = clib_min (svm_fifo_max_write_chunk (f), enq_max - read); read = SSL_read (oc->ssl, svm_fifo_tail (f), deq_now); @@ -452,8 +480,10 @@ check_app_fifo: svm_fifo_enqueue_nocopy (f, read); } - tls_notify_app_enqueue (ctx, app_session); - if (BIO_ctrl_pending (oc->wbio) > 0) + /* If handshake just completed, session may still be in accepting state */ + if (app_session->session_state >= SESSION_STATE_READY) + tls_notify_app_enqueue (ctx, app_session); + if (SSL_pending (oc->ssl) > 0) tls_add_vpp_q_builtin_rx_evt (tls_session); return wrote; @@ -468,9 +498,6 @@ openssl_ctx_init_client (tls_ctx_t * ctx) session_t *tls_session; const SSL_METHOD *method; int rv, err; -#ifdef HAVE_OPENSSL_ASYNC - openssl_resume_handler *handler; -#endif method = SSLv23_client_method (); if (method == NULL) @@ -532,6 +559,10 @@ openssl_ctx_init_client (tls_ctx_t * ctx) oc->openssl_ctx_index); tls_session = session_get_from_handle (ctx->tls_session_handle); + +#ifdef HAVE_OPENSSL_ASYNC + vpp_tls_async_init_event (ctx, openssl_ctx_handshake_rx, tls_session); +#endif while (1) { rv = SSL_do_handshake (oc->ssl); @@ -540,8 +571,8 @@ openssl_ctx_init_client (tls_ctx_t * ctx) #ifdef HAVE_OPENSSL_ASYNC if (err == SSL_ERROR_WANT_ASYNC) { - handler = (openssl_resume_handler *) openssl_ctx_handshake_rx; - vpp_ssl_async_process_event (ctx, handler); + openssl_check_async_status (ctx, openssl_ctx_handshake_rx, + tls_session); break; } #endif @@ -557,7 +588,6 @@ openssl_ctx_init_client (tls_ctx_t * ctx) static int openssl_start_listen (tls_ctx_t * lctx) { - application_t *app; const SSL_METHOD *method; SSL_CTX *ssl_ctx; int rv; @@ -566,17 +596,16 @@ openssl_start_listen (tls_ctx_t * lctx) EVP_PKEY *pkey; u32 olc_index; openssl_listen_ctx_t *olc; - app_worker_t *app_wrk; + app_cert_key_pair_t *ckpair; long flags = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION; openssl_main_t *om = &openssl_main; - app_wrk = app_worker_get (lctx->parent_app_wrk_index); - if (!app_wrk) + ckpair = app_cert_key_pair_get_if_valid (lctx->ckpair_index); + if (!ckpair) return -1; - app = application_get (app_wrk->app_index); - if (!app->tls_cert || !app->tls_key) + if (!ckpair->cert || !ckpair->key) { TLS_DBG (1, "tls cert and/or key not configured %d", lctx->parent_app_wrk_index); @@ -594,8 +623,10 @@ openssl_start_listen (tls_ctx_t * lctx) SSL_CTX_set_mode (ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE); #ifdef HAVE_OPENSSL_ASYNC if (om->async) - SSL_CTX_set_mode (ssl_ctx, SSL_MODE_ASYNC); - SSL_CTX_set_async_callback (ssl_ctx, tls_async_openssl_callback); + { + SSL_CTX_set_mode (ssl_ctx, SSL_MODE_ASYNC); + SSL_CTX_set_async_callback (ssl_ctx, tls_async_openssl_callback); + } #endif SSL_CTX_set_options (ssl_ctx, flags); SSL_CTX_set_ecdh_auto (ssl_ctx, 1); @@ -611,7 +642,7 @@ openssl_start_listen (tls_ctx_t * lctx) * Set the key and cert */ cert_bio = BIO_new (BIO_s_mem ()); - BIO_write (cert_bio, app->tls_cert, vec_len (app->tls_cert)); + BIO_write (cert_bio, ckpair->cert, vec_len (ckpair->cert)); srvcert = PEM_read_bio_X509 (cert_bio, NULL, NULL, NULL); if (!srvcert) { @@ -622,7 +653,7 @@ openssl_start_listen (tls_ctx_t * lctx) BIO_free (cert_bio); cert_bio = BIO_new (BIO_s_mem ()); - BIO_write (cert_bio, app->tls_key, vec_len (app->tls_key)); + BIO_write (cert_bio, ckpair->key, vec_len (ckpair->key)); pkey = PEM_read_bio_PrivateKey (cert_bio, NULL, NULL, NULL); if (!pkey) { @@ -671,9 +702,6 @@ openssl_ctx_init_server (tls_ctx_t * ctx) openssl_listen_ctx_t *olc; session_t *tls_session; int rv, err; -#ifdef HAVE_OPENSSL_ASYNC - openssl_resume_handler *handler; -#endif /* Start a new connection */ @@ -698,6 +726,9 @@ openssl_ctx_init_server (tls_ctx_t * ctx) oc->openssl_ctx_index); tls_session = session_get_from_handle (ctx->tls_session_handle); +#ifdef HAVE_OPENSSL_ASYNC + vpp_tls_async_init_event (ctx, openssl_ctx_handshake_rx, tls_session); +#endif while (1) { rv = SSL_do_handshake (oc->ssl); @@ -706,8 +737,8 @@ openssl_ctx_init_server (tls_ctx_t * ctx) #ifdef HAVE_OPENSSL_ASYNC if (err == SSL_ERROR_WANT_ASYNC) { - handler = (openssl_resume_handler *) openssl_ctx_handshake_rx; - vpp_ssl_async_process_event (ctx, handler); + openssl_check_async_status (ctx, openssl_ctx_handshake_rx, + tls_session); break; } #endif @@ -732,9 +763,14 @@ openssl_handshake_is_over (tls_ctx_t * ctx) static int openssl_transport_close (tls_ctx_t * ctx) { +#ifdef HAVE_OPENSSL_ASYNC + if (vpp_openssl_is_inflight (ctx)) + return 0; +#endif + if (!openssl_handshake_is_over (ctx)) { - session_close (session_get_from_handle (ctx->tls_session_handle)); + openssl_handle_handshake_failure (ctx); return 0; } session_transport_closing_notify (&ctx->connection); @@ -744,9 +780,16 @@ openssl_transport_close (tls_ctx_t * ctx) static int openssl_app_close (tls_ctx_t * ctx) { - tls_disconnect_transport (ctx); - session_transport_delete_notify (&ctx->connection); - openssl_ctx_free (ctx); + openssl_ctx_t *oc = (openssl_ctx_t *) ctx; + session_t *app_session; + + /* Wait for all data to be written to tcp */ + app_session = session_get_from_handle (ctx->app_session_handle); + if (BIO_ctrl_pending (oc->rbio) <= 0 + && !svm_fifo_max_dequeue_cons (app_session->tx_fifo)) + openssl_confirm_app_close (ctx); + else + ctx->app_closed = 1; return 0; } @@ -787,7 +830,12 @@ tls_init_ca_chain (void) return -1; } +#if OPENSSL_VERSION_NUMBER >= 0x30000000L + rv = X509_STORE_load_file (om->cert_store, tm->ca_cert_path); +#else rv = X509_STORE_load_locations (om->cert_store, tm->ca_cert_path, 0); +#endif + if (rv < 0) { clib_warning ("failed to load ca certificate"); @@ -809,7 +857,7 @@ tls_init_ca_chain (void) return (rv < 0 ? -1 : 0); } -static int +int tls_openssl_set_ciphers (char *ciphers) { openssl_main_t *om = &openssl_main; @@ -835,8 +883,10 @@ tls_openssl_init (vlib_main_t * vm) { vlib_thread_main_t *vtm = vlib_get_thread_main (); openssl_main_t *om = &openssl_main; + clib_error_t *error = 0; u32 num_threads; + error = tls_openssl_api_init (vm); num_threads = 1 /* main thread */ + vtm->n_threads; SSL_library_init (); @@ -850,7 +900,7 @@ tls_openssl_init (vlib_main_t * vm) vec_validate (om->ctx_pool, num_threads - 1); - tls_register_engine (&openssl_engine, TLS_ENGINE_OPENSSL); + tls_register_engine (&openssl_engine, CRYPTO_ENGINE_OPENSSL); om->engine_init = 0; @@ -858,7 +908,7 @@ tls_openssl_init (vlib_main_t * vm) tls_openssl_set_ciphers ("ALL:!ADH:!LOW:!EXP:!MD5:!RC4-SHA:!DES-CBC3-SHA:@STRENGTH"); - return 0; + return error; } /* *INDENT-OFF* */ VLIB_INIT_FUNCTION (tls_openssl_init) = @@ -877,7 +927,7 @@ tls_openssl_set_command_fn (vlib_main_t * vm, unformat_input_t * input, char *engine_alg = NULL; char *ciphers = NULL; u8 engine_name_set = 0; - int i; + int i, async = 0; /* By present, it is not allowed to configure engine again after running */ if (om->engine_init) @@ -895,8 +945,7 @@ tls_openssl_set_command_fn (vlib_main_t * vm, unformat_input_t * input, } else if (unformat (input, "async")) { - om->async = 1; - openssl_async_node_enable_disable (1); + async = 1; } else if (unformat (input, "alg %s", &engine_alg)) { @@ -916,16 +965,23 @@ tls_openssl_set_command_fn (vlib_main_t * vm, unformat_input_t * input, if (!engine_name_set) { clib_warning ("No engine provided! \n"); - om->async = 0; + async = 0; } else { - if (!openssl_engine_register (engine_name, engine_alg)) + vnet_session_enable_disable (vm, 1); + if (openssl_engine_register (engine_name, engine_alg, async) < 0) { - return clib_error_return (0, "failed to register %s polling", + return clib_error_return (0, "Failed to register %s polling", engine_name); } + else + { + vlib_cli_output (vm, "Successfully register engine %s\n", + engine_name); + } } + om->async = async; return 0; }