From 8ce1c2c7e9abc90a63ad74df5ad4cc7c37b24c87 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Mon, 27 Sep 2021 10:10:37 +0300 Subject: [PATCH] Configure: check for QUIC 0-RTT support at compile time. --- auto/lib/openssl/conf | 9 --------- src/event/quic/ngx_event_quic_ssl.c | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index a9cb0094e..8b84c02a4 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -165,13 +165,4 @@ with nginx by using --with-openssl= option. END exit 1 fi - - ngx_feature="OpenSSL QUIC 0-RTT context" - ngx_feature_name="NGX_OPENSSL_QUIC_ZRTT_CTX" - ngx_feature_run=no - ngx_feature_incs="#include " - ngx_feature_path= - ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" - ngx_feature_test="SSL_set_quic_early_data_context(NULL, NULL, 0)" - . auto/feature fi diff --git a/src/event/quic/ngx_event_quic_ssl.c b/src/event/quic/ngx_event_quic_ssl.c index f589d74ac..6e2377eac 100644 --- a/src/event/quic/ngx_event_quic_ssl.c +++ b/src/event/quic/ngx_event_quic_ssl.c @@ -549,7 +549,7 @@ ngx_quic_init_connection(ngx_connection_t *c) return NGX_ERROR; } -#if (NGX_OPENSSL_QUIC_ZRTT_CTX) +#if BORINGSSL_API_VERSION >= 11 if (SSL_set_quic_early_data_context(ssl_conn, p, clen) == 0) { ngx_log_error(NGX_LOG_INFO, c->log, 0, "quic SSL_set_quic_early_data_context() failed");