X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Ftlsopenssl%2Ftls_openssl.c;h=7994cc5d9816278df4233a858590291f3df0eed2;hb=b7b929931a07fbb27b43d5cd105f366c3e29807e;hp=0817f606ad89027cd323964a9e0acd3ae26d2316;hpb=58d36f02b45c5af38b7df81fb7976129cad3e05b;p=vpp.git diff --git a/src/plugins/tlsopenssl/tls_openssl.c b/src/plugins/tlsopenssl/tls_openssl.c index 0817f606ad8..7994cc5d981 100644 --- a/src/plugins/tlsopenssl/tls_openssl.c +++ b/src/plugins/tlsopenssl/tls_openssl.c @@ -16,30 +16,19 @@ #include #include #include +#ifdef HAVE_OPENSSL_ASYNC +#include +#endif +#include #include #include #include +#include +#include -typedef struct tls_ctx_openssl_ -{ - tls_ctx_t ctx; /**< First */ - u32 openssl_ctx_index; - SSL_CTX *ssl_ctx; - SSL *ssl; - BIO *rbio; - BIO *wbio; - X509 *srvcert; - EVP_PKEY *pkey; -} openssl_ctx_t; - -typedef struct openssl_main_ -{ - openssl_ctx_t ***ctx_pool; - X509_STORE *cert_store; -} openssl_main_t; +#define MAX_CRYPTO_LEN 16 static openssl_main_t openssl_main; - static u32 openssl_ctx_alloc (void) { @@ -51,7 +40,7 @@ openssl_ctx_alloc (void) if (!(*ctx)) *ctx = clib_mem_alloc (sizeof (openssl_ctx_t)); - memset (*ctx, 0, sizeof (openssl_ctx_t)); + 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.app_session_handle = SESSION_INVALID_HANDLE; @@ -67,18 +56,13 @@ openssl_ctx_free (tls_ctx_t * ctx) if (SSL_is_init_finished (oc->ssl) && !ctx->is_passive_close) SSL_shutdown (oc->ssl); - if (SSL_is_server (oc->ssl)) - { - X509_free (oc->srvcert); - EVP_PKEY_free (oc->pkey); - } SSL_free (oc->ssl); pool_put_index (openssl_main.ctx_pool[ctx->c_thread_index], oc->openssl_ctx_index); } -static tls_ctx_t * +tls_ctx_t * openssl_ctx_get (u32 ctx_index) { openssl_ctx_t **ctx; @@ -87,7 +71,7 @@ openssl_ctx_get (u32 ctx_index) return &(*ctx)->ctx; } -static tls_ctx_t * +tls_ctx_t * openssl_ctx_get_w_thread (u32 ctx_index, u8 thread_index) { openssl_ctx_t **ctx; @@ -95,6 +79,31 @@ openssl_ctx_get_w_thread (u32 ctx_index, u8 thread_index) return &(*ctx)->ctx; } +static u32 +openssl_listen_ctx_alloc (void) +{ + openssl_main_t *om = &openssl_main; + openssl_listen_ctx_t *lctx; + + pool_get (om->lctx_pool, lctx); + + clib_memset (lctx, 0, sizeof (openssl_listen_ctx_t)); + lctx->openssl_lctx_index = lctx - om->lctx_pool; + return lctx->openssl_lctx_index; +} + +static void +openssl_listen_ctx_free (openssl_listen_ctx_t * lctx) +{ + pool_put_index (openssl_main.lctx_pool, lctx->openssl_lctx_index); +} + +openssl_listen_ctx_t * +openssl_lctx_get (u32 lctx_index) +{ + return pool_elt_at_index (openssl_main.lctx_pool, lctx_index); +} + static int openssl_try_handshake_read (openssl_ctx_t * oc, stream_session_t * tls_session) @@ -149,7 +158,7 @@ openssl_try_handshake_write (openssl_ctx_t * oc, return 0; svm_fifo_enqueue_nocopy (f, read); - tls_add_vpp_q_evt (f, FIFO_EVENT_APP_TX); + tls_add_vpp_q_tx_evt (tls_session); if (read < enq_max) { @@ -165,19 +174,78 @@ openssl_try_handshake_write (openssl_ctx_t * oc, return read; } +#ifdef HAVE_OPENSSL_ASYNC +static int +vpp_ssl_async_process_event (tls_ctx_t * ctx, + openssl_resume_handler * handler) +{ + openssl_ctx_t *oc = (openssl_ctx_t *) ctx; + openssl_tls_callback_t *engine_cb; + + engine_cb = vpp_add_async_pending_event (ctx, handler); + if (engine_cb) + { + SSL_set_async_callback (oc->ssl, (void *) engine_cb->callback, + (void *) engine_cb->arg); + TLS_DBG (2, "set callback to engine %p\n", engine_cb->callback); + } + return 0; + +} + +/* 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) +{ + openssl_ctx_t *oc = (openssl_ctx_t *) ctx; + + if (vpp_add_async_run_event (ctx, handler)) + { + SSL_set_async_estatus (oc->ssl, 0); + } + return 0; + +} + +#endif + +int openssl_ctx_handshake_rx (tls_ctx_t * ctx, stream_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)) { - if (!openssl_try_handshake_read (oc, tls_session)) - break; + if (ctx->resume) + { + ctx->resume = 0; + } + else if (!openssl_try_handshake_read (oc, tls_session)) + { + 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 + myself = openssl_ctx_handshake_rx; + if (SSL_get_async_estatus (oc->ssl, &estatus) + && (estatus == ENGINE_STATUS_RETRY)) + { + vpp_ssl_async_retry_func (ctx, myself); + } + else if (err == SSL_ERROR_WANT_ASYNC) + { + vpp_ssl_async_process_event (ctx, myself); + } +#endif + if (err != SSL_ERROR_WANT_WRITE) { if (err == SSL_ERROR_SSL) @@ -250,7 +318,7 @@ openssl_ctx_write (tls_ctx_t * ctx, stream_session_t * app_session) wrote = SSL_write (oc->ssl, svm_fifo_head (f), to_write); if (wrote <= 0) { - tls_add_vpp_q_evt (app_session->server_tx_fifo, FIFO_EVENT_APP_TX); + tls_add_vpp_q_builtin_tx_evt (app_session); goto check_tls_fifo; } svm_fifo_dequeue_drop (app_session->server_tx_fifo, wrote); @@ -265,8 +333,8 @@ openssl_ctx_write (tls_ctx_t * ctx, stream_session_t * app_session) } } - if (deq_now < deq_max) - tls_add_vpp_q_evt (app_session->server_tx_fifo, FIFO_EVENT_APP_TX); + if (wrote < deq_max) + tls_add_vpp_q_builtin_tx_evt (app_session); check_tls_fifo: @@ -278,7 +346,7 @@ check_tls_fifo: enq_max = svm_fifo_max_enqueue (f); if (!enq_max) { - tls_add_vpp_q_evt (app_session->server_tx_fifo, FIFO_EVENT_APP_TX); + tls_add_vpp_q_builtin_tx_evt (app_session); return wrote; } @@ -286,12 +354,12 @@ check_tls_fifo: read = BIO_read (oc->rbio, svm_fifo_tail (f), deq_now); if (read <= 0) { - tls_add_vpp_q_evt (app_session->server_tx_fifo, FIFO_EVENT_APP_TX); + tls_add_vpp_q_builtin_tx_evt (app_session); return wrote; } svm_fifo_enqueue_nocopy (f, read); - tls_add_vpp_q_evt (f, FIFO_EVENT_APP_TX); + tls_add_vpp_q_tx_evt (tls_session); if (read < enq_max && BIO_ctrl_pending (oc->rbio) > 0) { @@ -302,7 +370,7 @@ check_tls_fifo: } if (BIO_ctrl_pending (oc->rbio) > 0) - tls_add_vpp_q_evt (app_session->server_tx_fifo, FIFO_EVENT_APP_TX); + tls_add_vpp_q_builtin_tx_evt (app_session); return wrote; } @@ -334,7 +402,7 @@ openssl_ctx_read (tls_ctx_t * ctx, stream_session_t * tls_session) wrote = BIO_write (oc->wbio, svm_fifo_head (f), to_read); if (wrote <= 0) { - tls_add_vpp_q_evt (tls_session->server_rx_fifo, FIFO_EVENT_BUILTIN_RX); + tls_add_vpp_q_builtin_rx_evt (tls_session); goto check_app_fifo; } svm_fifo_dequeue_drop (f, wrote); @@ -349,7 +417,7 @@ openssl_ctx_read (tls_ctx_t * ctx, stream_session_t * tls_session) } } if (svm_fifo_max_dequeue (f)) - tls_add_vpp_q_evt (tls_session->server_rx_fifo, FIFO_EVENT_BUILTIN_RX); + tls_add_vpp_q_builtin_rx_evt (tls_session); check_app_fifo: @@ -361,7 +429,7 @@ check_app_fifo: enq_max = svm_fifo_max_enqueue (f); if (!enq_max) { - tls_add_vpp_q_evt (tls_session->server_rx_fifo, FIFO_EVENT_BUILTIN_RX); + tls_add_vpp_q_builtin_rx_evt (tls_session); return wrote; } @@ -369,7 +437,7 @@ check_app_fifo: read = SSL_read (oc->ssl, svm_fifo_tail (f), deq_now); if (read <= 0) { - tls_add_vpp_q_evt (tls_session->server_rx_fifo, FIFO_EVENT_BUILTIN_RX); + tls_add_vpp_q_builtin_rx_evt (tls_session); return wrote; } svm_fifo_enqueue_nocopy (f, read); @@ -383,7 +451,7 @@ check_app_fifo: tls_notify_app_enqueue (ctx, app_session); if (BIO_ctrl_pending (oc->wbio) > 0) - tls_add_vpp_q_evt (tls_session->server_rx_fifo, FIFO_EVENT_BUILTIN_RX); + tls_add_vpp_q_builtin_rx_evt (tls_session); return wrote; } @@ -391,13 +459,15 @@ check_app_fifo: static int openssl_ctx_init_client (tls_ctx_t * ctx) { - char *ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:!RC4-SHA:!DES-CBC3-SHA:@STRENGTH"; long flags = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION; openssl_ctx_t *oc = (openssl_ctx_t *) ctx; openssl_main_t *om = &openssl_main; stream_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) @@ -415,7 +485,11 @@ openssl_ctx_init_client (tls_ctx_t * ctx) SSL_CTX_set_ecdh_auto (oc->ssl_ctx, 1); SSL_CTX_set_mode (oc->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE); - rv = SSL_CTX_set_cipher_list (oc->ssl_ctx, (const char *) ciphers); +#ifdef HAVE_OPENSSL_ASYNC + if (om->async) + SSL_CTX_set_mode (oc->ssl_ctx, SSL_MODE_ASYNC); +#endif + rv = SSL_CTX_set_cipher_list (oc->ssl_ctx, (const char *) om->ciphers); if (rv != 1) { TLS_DBG (1, "Couldn't set cipher"); @@ -460,6 +534,14 @@ openssl_ctx_init_client (tls_ctx_t * ctx) 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) + { + handler = (openssl_resume_handler *) openssl_ctx_handshake_rx; + vpp_ssl_async_process_event (ctx, handler); + break; + } +#endif if (err != SSL_ERROR_WANT_WRITE) break; } @@ -470,38 +552,46 @@ openssl_ctx_init_client (tls_ctx_t * ctx) } static int -openssl_ctx_init_server (tls_ctx_t * ctx) +openssl_start_listen (tls_ctx_t * lctx) { - char *ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:!RC4-SHA:!DES-CBC3-SHA:@STRENGTH"; - long flags = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION; - openssl_ctx_t *oc = (openssl_ctx_t *) ctx; - stream_session_t *tls_session; - const SSL_METHOD *method; application_t *app; - int rv, err; + const SSL_METHOD *method; + SSL_CTX *ssl_ctx; + int rv; BIO *cert_bio; + X509 *srvcert; + EVP_PKEY *pkey; + u32 olc_index; + openssl_listen_ctx_t *olc; - app = application_get (ctx->parent_app_index); + long flags = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION; + openssl_main_t *om = &openssl_main; + + app = application_get (lctx->parent_app_index); if (!app->tls_cert || !app->tls_key) { TLS_DBG (1, "tls cert and/or key not configured %d", - ctx->parent_app_index); + lctx->parent_app_index); return -1; } method = SSLv23_method (); - oc->ssl_ctx = SSL_CTX_new (method); - if (!oc->ssl_ctx) + ssl_ctx = SSL_CTX_new (method); + if (!ssl_ctx) { clib_warning ("Unable to create SSL context"); return -1; } - SSL_CTX_set_mode (oc->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE); - SSL_CTX_set_options (oc->ssl_ctx, flags); - SSL_CTX_set_ecdh_auto (oc->ssl_ctx, 1); + 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); +#endif + SSL_CTX_set_options (ssl_ctx, flags); + SSL_CTX_set_ecdh_auto (ssl_ctx, 1); - rv = SSL_CTX_set_cipher_list (oc->ssl_ctx, (const char *) ciphers); + rv = SSL_CTX_set_cipher_list (ssl_ctx, (const char *) om->ciphers); if (rv != 1) { TLS_DBG (1, "Couldn't set cipher"); @@ -513,25 +603,73 @@ openssl_ctx_init_server (tls_ctx_t * ctx) */ cert_bio = BIO_new (BIO_s_mem ()); BIO_write (cert_bio, app->tls_cert, vec_len (app->tls_cert)); - oc->srvcert = PEM_read_bio_X509 (cert_bio, NULL, NULL, NULL); - if (!oc->srvcert) + srvcert = PEM_read_bio_X509 (cert_bio, NULL, NULL, NULL); + if (!srvcert) { clib_warning ("unable to parse certificate"); return -1; } + SSL_CTX_use_certificate (ssl_ctx, srvcert); BIO_free (cert_bio); + cert_bio = BIO_new (BIO_s_mem ()); BIO_write (cert_bio, app->tls_key, vec_len (app->tls_key)); - oc->pkey = PEM_read_bio_PrivateKey (cert_bio, NULL, NULL, NULL); - if (!oc->pkey) + pkey = PEM_read_bio_PrivateKey (cert_bio, NULL, NULL, NULL); + if (!pkey) { clib_warning ("unable to parse pkey"); return -1; } - + SSL_CTX_use_PrivateKey (ssl_ctx, pkey); BIO_free (cert_bio); - oc->ssl = SSL_new (oc->ssl_ctx); + olc_index = openssl_listen_ctx_alloc (); + olc = openssl_lctx_get (olc_index); + olc->ssl_ctx = ssl_ctx; + olc->srvcert = srvcert; + olc->pkey = pkey; + + /* store SSL_CTX into TLS level structure */ + lctx->tls_ssl_ctx = olc_index; + + return 0; + +} + +static int +openssl_stop_listen (tls_ctx_t * lctx) +{ + u32 olc_index; + openssl_listen_ctx_t *olc; + + olc_index = lctx->tls_ssl_ctx; + olc = openssl_lctx_get (olc_index); + + X509_free (olc->srvcert); + EVP_PKEY_free (olc->pkey); + + SSL_CTX_free (olc->ssl_ctx); + openssl_listen_ctx_free (olc); + + return 0; +} + +static int +openssl_ctx_init_server (tls_ctx_t * ctx) +{ + openssl_ctx_t *oc = (openssl_ctx_t *) ctx; + u32 olc_index = ctx->tls_ssl_ctx; + openssl_listen_ctx_t *olc; + stream_session_t *tls_session; + int rv, err; +#ifdef HAVE_OPENSSL_ASYNC + openssl_resume_handler *handler; +#endif + + /* Start a new connection */ + + olc = openssl_lctx_get (olc_index); + oc->ssl = SSL_new (olc->ssl_ctx); if (oc->ssl == NULL) { TLS_DBG (1, "Couldn't initialize ssl struct"); @@ -556,6 +694,14 @@ openssl_ctx_init_server (tls_ctx_t * ctx) 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) + { + handler = (openssl_resume_handler *) openssl_ctx_handshake_rx; + vpp_ssl_async_process_event (ctx, handler); + break; + } +#endif if (err != SSL_ERROR_WANT_WRITE) break; } @@ -584,6 +730,8 @@ const static tls_engine_vft_t openssl_engine = { .ctx_write = openssl_ctx_write, .ctx_read = openssl_ctx_read, .ctx_handshake_is_over = openssl_handshake_is_over, + .ctx_start_listen = openssl_start_listen, + .ctx_stop_listen = openssl_stop_listen, }; int @@ -629,6 +777,27 @@ tls_init_ca_chain (void) return (rv < 0 ? -1 : 0); } +static int +tls_openssl_set_ciphers (char *ciphers) +{ + openssl_main_t *om = &openssl_main; + int i; + + if (!ciphers) + { + return -1; + } + + vec_validate (om->ciphers, strlen (ciphers) - 1); + for (i = 0; i < vec_len (om->ciphers); i++) + { + om->ciphers[i] = toupper (ciphers[i]); + } + + return 0; + +} + static clib_error_t * tls_openssl_init (vlib_main_t * vm) { @@ -654,9 +823,90 @@ tls_openssl_init (vlib_main_t * vm) vec_validate (om->ctx_pool, num_threads - 1); tls_register_engine (&openssl_engine, TLS_ENGINE_OPENSSL); + + om->engine_init = 0; + + /* default ciphers */ + tls_openssl_set_ciphers + ("ALL:!ADH:!LOW:!EXP:!MD5:!RC4-SHA:!DES-CBC3-SHA:@STRENGTH"); + + return 0; +} + +#ifdef HAVE_OPENSSL_ASYNC +static clib_error_t * +tls_openssl_set_command_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + openssl_main_t *om = &openssl_main; + char *engine_name = NULL; + char *engine_alg = NULL; + char *ciphers = NULL; + u8 engine_name_set = 0; + int i; + + /* By present, it is not allowed to configure engine again after running */ + if (om->engine_init) + { + clib_warning ("engine has started!\n"); + return clib_error_return + (0, "engine has started, and no config is accepted"); + } + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "engine %s", &engine_name)) + { + engine_name_set = 1; + } + else if (unformat (input, "async")) + { + om->async = 1; + openssl_async_node_enable_disable (1); + } + else if (unformat (input, "alg %s", &engine_alg)) + { + for (i = 0; i < strnlen (engine_alg, MAX_CRYPTO_LEN); i++) + engine_alg[i] = toupper (engine_alg[i]); + } + else if (unformat (input, "ciphers %s", &ciphers)) + { + tls_openssl_set_ciphers (ciphers); + } + else + return clib_error_return (0, "failed: unknown input `%U'", + format_unformat_error, input); + } + + /* reset parameters if engine is not configured */ + if (!engine_name_set) + { + clib_warning ("No engine provided! \n"); + om->async = 0; + } + else + { + if (!openssl_engine_register (engine_name, engine_alg)) + { + return clib_error_return (0, "failed to register %s polling", + engine_name); + } + } + return 0; } +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (tls_openssl_set_command, static) = +{ + .path = "tls openssl set", + .short_help = "tls openssl set [engine ] [alg [algorithm] [async]", + .function = tls_openssl_set_command_fn, +}; +/* *INDENT-ON* */ +#endif + + VLIB_INIT_FUNCTION (tls_openssl_init); /* *INDENT-OFF* */