# HG changeset patch # User Sergey Kandaurov # Date 1666268466 -14400 # Node ID 41796b6804d95d7e3f965f647a003262108b4862 # Parent cd0d6e176908b81507a647caec8190b83fe99da7 QUIC: support for setting QUIC methods with LibreSSL. Setting QUIC methods is converted to use C99 designated initializers for simplicity, as LibreSSL 3.6.0 has different SSL_QUIC_METHOD layout. Additionally, only set_read_secret/set_write_secret callbacks are set. Although they are preferred in LibreSSL over set_encryption_secrets, better be on a safe side as LibreSSL has unexpectedly incompatible set_encryption_secrets calling convention expressed in passing read and write secrets split in separate calls, unlike this is documented in old BoringSSL sources. To avoid introducing further changes for the old API, it is simply disabled. diff --git a/src/event/quic/ngx_event_quic_ssl.c b/src/event/quic/ngx_event_quic_ssl.c --- a/src/event/quic/ngx_event_quic_ssl.c +++ b/src/event/quic/ngx_event_quic_ssl.c @@ -18,7 +18,7 @@ #define NGX_QUIC_MAX_BUFFERED 65535 -#if BORINGSSL_API_VERSION >= 10 +#if BORINGSSL_API_VERSION >= 10 || defined LIBRESSL_VERSION_NUMBER static int ngx_quic_set_read_secret(ngx_ssl_conn_t *ssl_conn, enum ssl_encryption_level_t level, const SSL_CIPHER *cipher, const uint8_t *secret, size_t secret_len); @@ -40,19 +40,19 @@ static ngx_int_t ngx_quic_crypto_input(n static SSL_QUIC_METHOD quic_method = { -#if BORINGSSL_API_VERSION >= 10 - ngx_quic_set_read_secret, - ngx_quic_set_write_secret, +#if BORINGSSL_API_VERSION >= 10 || defined LIBRESSL_VERSION_NUMBER + .set_read_secret = ngx_quic_set_read_secret, + .set_write_secret = ngx_quic_set_write_secret, #else - ngx_quic_set_encryption_secrets, + .set_encryption_secrets = ngx_quic_set_encryption_secrets, #endif - ngx_quic_add_handshake_data, - ngx_quic_flush_flight, - ngx_quic_send_alert, + .add_handshake_data = ngx_quic_add_handshake_data, + .flush_flight = ngx_quic_flush_flight, + .send_alert = ngx_quic_send_alert, }; -#if BORINGSSL_API_VERSION >= 10 +#if BORINGSSL_API_VERSION >= 10 || defined LIBRESSL_VERSION_NUMBER static int ngx_quic_set_read_secret(ngx_ssl_conn_t *ssl_conn,