MINOR: quic: Allow the use of the new OpenSSL 3.5.0 QUIC TLS API (to be completed)

This patch allows the use of the new OpenSSL 3.5.0 QUIC TLS API when it is
available and detected at compilation time. The detection relies on the presence of the
OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_SEND macro from openssl-compat.h. Indeed this
macro is defined by OpenSSL since 3.5.0 version. It is not defined by quictls.
This helps in distinguishing these two TLS stacks. When the detection succeeds,
HAVE_OPENSSL_QUIC is also defined by openssl-compat.h. Then, this is this new macro
which is used to detect the availability of the new OpenSSL 3.5.0 QUIC TLS API.

Note that this detection is done only if USE_QUIC_OPENSSL_COMPAT is not asked.
So, USE_QUIC_OPENSSL_COMPAT and HAVE_OPENSSL_QUIC are exclusive.

At the same location, from openssl-compat.h, ssl_encryption_level_t enum is
defined. This enum was defined by quictls and expansively used by the haproxy
QUIC implementation. SSL_set_quic_transport_params() is replaced by
SSL_set_quic_tls_transport_params. SSL_set_quic_early_data_enabled() (quictls) is also replaced
by SSL_set_quic_tls_early_data_enabled() (OpenSSL). SSL_quic_read_level() (quictls)
is not defined by OpenSSL. It is only used by the traces to log the current
TLS stack decryption level (read). A macro makes it return -1 which is an
usused values.

The most of the differences between quictls and OpenSSL QUI APIs are in quic_ssl.c
where some callbacks must be defined for these two APIs. This is why this
patch modifies quic_ssl.c to define an array of OSSL_DISPATCH structs: <ha_quic_dispatch>.
Each element of this arry defines a callback. So, this patch implements these
six callabcks:

  - ha_quic_ossl_crypto_send()
  - ha_quic_ossl_crypto_recv_rcd()
  - ha_quic_ossl_crypto_release_rcd()
  - ha_quic_ossl_yield_secret()
  - ha_quic_ossl_got_transport_params() and
  - ha_quic_ossl_alert().

But at this time, these implementations which must return an int return 0 interpreted
as a failure by the OpenSSL QUIC API, except for ha_quic_ossl_alert() which
is implemented the same was as for quictls. The five remaining functions above
will be implemented by the next patches to come.

ha_quic_set_encryption_secrets() and ha_quic_add_handshake_data() have been moved
to be defined for both quictls and OpenSSL QUIC API.

These callbacks are attached to the SSL objects (sessions) calling qc_ssl_set_cbs()
new function. This latter callback the correct function to attached the correct
callbacks to the SSL objects (defined by <ha_quic_method> for quictls, and
<ha_quic_dispatch> for OpenSSL).

The calls to SSL_provide_quic_data() and SSL_process_quic_post_handshake()
have been also disabled. These functions are not defined by OpenSSL QUIC API.
At this time, the functions which call them are still defined when HAVE_OPENSSL_QUIC
is defined.

diff --git a/include/haproxy/openssl-compat.h b/include/haproxy/openssl-compat.h
index 4d8d94007f88ae678993f1f1443482345ce28e33..114b52f60a2f580f577b20a8f76361b0ec12818d 100644 (file)
--- a/include/haproxy/openssl-compat.h
+++ b/include/haproxy/openssl-compat.h
@@ -46,7 +46,25 @@
 
 #ifdef USE_QUIC_OPENSSL_COMPAT
 #include <haproxy/quic_openssl_compat.h>
+#else
+#if defined(OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_SEND)
+/* This macro is defined by the new OpenSSL 3.5.0 QUIC TLS API and it is not
+ * defined by quictls.
+ */
+#define HAVE_OPENSSL_QUIC
+#define SSL_set_quic_transport_params   SSL_set_quic_tls_transport_params
+#define SSL_set_quic_early_data_enabled SSL_set_quic_tls_early_data_enabled
+#define SSL_quic_read_level(arg) -1
+
+enum ssl_encryption_level_t {
+       ssl_encryption_initial = 0,
+       ssl_encryption_early_data,
+       ssl_encryption_handshake,
+       ssl_encryption_application
+};
+
 #endif
+#endif /* USE_QUIC_OPENSSL_COMPAT */
 
 #if defined(OPENSSL_IS_AWSLC)
 #define OPENSSL_NO_DH

diff --git a/include/haproxy/quic_ssl.h b/include/haproxy/quic_ssl.h
index a5bcb4fb49e85c4eea652ce0bc87ef36d563920b..504d7f03a44ab1f0fae6dd9801518b51d633cdf9 100644 (file)
--- a/include/haproxy/quic_ssl.h
+++ b/include/haproxy/quic_ssl.h
@@ -36,6 +36,7 @@
 int ssl_quic_initial_ctx(struct bind_conf *bind_conf);
 int qc_alloc_ssl_sock_ctx(struct quic_conn *qc);
 int qc_ssl_provide_all_quic_data(struct quic_conn *qc, struct ssl_sock_ctx *ctx);
+int quic_ssl_set_tls_cbs(SSL *ssl);
 
 static inline void qc_free_ssl_sock_ctx(struct ssl_sock_ctx **ctx)
 {

diff --git a/include/haproxy/quic_trace-t.h b/include/haproxy/quic_trace-t.h
index 1c977b46f383af4c327f958901ade240b1011d87..4fd4a33cbadd9fca785919483e843f33f7d5a191 100644 (file)
--- a/include/haproxy/quic_trace-t.h
+++ b/include/haproxy/quic_trace-t.h
@@ -99,5 +99,6 @@ struct quic_rx_crypto_frm {
 #define           QUIC_EV_CONN_KP        (1ULL << 50)
 #define           QUIC_EV_CONN_SSL_COMPAT (1ULL << 51)
 #define           QUIC_EV_CONN_BIND_TID  (1ULL << 52)
+#define           QUIC_EV_CONN_RELEASE_RCD (1ULL << 53)
 
 #endif /* _HAPROXY_QUIC_TRACE_T_H */

diff --git a/src/quic_ssl.c b/src/quic_ssl.c
index 4734136a4302225a699d145d4bbee661ad2fca4e..04a13cb1e668cba156c519195959a7dbbeb53bc8 100644 (file)
--- a/src/quic_ssl.c
+++ b/src/quic_ssl.c
@@ -325,27 +325,6 @@ write:
        return ret;
 }
 
-#if defined(OPENSSL_IS_AWSLC)
-/* compatibility function for split read/write encryption secrets to be used
- * with the API which uses 2 callbacks. */
-static inline int ha_quic_set_read_secret(SSL *ssl, enum ssl_encryption_level_t level,
-                                   const SSL_CIPHER *cipher, const uint8_t *secret,
-                                   size_t secret_len)
-{
-       return ha_quic_set_encryption_secrets(ssl, level, secret, NULL, secret_len);
-
-}
-
-static inline int ha_quic_set_write_secret(SSL *ssl, enum ssl_encryption_level_t level,
-                                   const SSL_CIPHER *cipher, const uint8_t *secret,
-                                   size_t secret_len)
-{
-
-       return ha_quic_set_encryption_secrets(ssl, level, NULL, secret, secret_len);
-
-}
-#endif
-
 /* ->add_handshake_data QUIC TLS callback used by the QUIC TLS stack when it
  * wants to provide the QUIC layer with CRYPTO data.
  * Returns 1 if succeeded, 0 if not.
@@ -389,6 +368,137 @@ static int ha_quic_add_handshake_data(SSL *ssl, enum ssl_encryption_level_t leve
        return ret;
 }
 
+#ifdef HAVE_OPENSSL_QUIC
+/************************** OpenSSL QUIC TLS API (>= 3.5.0) *******************/
+
+static int ha_quic_ossl_crypto_send(SSL *ssl,
+                                    const unsigned char *buf, size_t buf_len,
+                                    size_t *consumed, void *arg)
+{
+       int ret = 0;
+       struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
+
+       TRACE_ENTER(QUIC_EV_CONN_ADDDATA, qc);
+       TRACE_LEAVE(QUIC_EV_CONN_ADDDATA, qc);
+
+       return ret;
+}
+
+static int ha_quic_ossl_crypto_recv_rcd(SSL *ssl,
+                                        const unsigned char **buf, size_t *bytes_read,
+                                        void *arg)
+{
+       int ret = 0;
+       struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
+
+       TRACE_ENTER(QUIC_EV_CONN_SSLDATA, qc);
+       TRACE_LEAVE(QUIC_EV_CONN_SSLDATA, qc);
+
+       return ret;
+}
+
+static int ha_quic_ossl_crypto_release_rcd(SSL *ssl, size_t bytes_read, void *arg)
+{
+       int ret = 0;
+       struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
+
+       TRACE_ENTER(QUIC_EV_CONN_RELEASE_RCD, qc);
+       TRACE_LEAVE(QUIC_EV_CONN_RELEASE_RCD, qc);
+
+       return ret;
+}
+
+static int ha_quic_ossl_yield_secret(SSL *ssl, uint32_t prot_level, int direction,
+                                     const unsigned char *secret, size_t secret_len,
+                                     void *arg)
+{
+       int ret = 0;
+       struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
+
+       TRACE_ENTER(QUIC_EV_CONN_RWSEC, qc);
+       TRACE_LEAVE(QUIC_EV_CONN_RWSEC, qc);
+
+       return ret;
+}
+
+static int ha_quic_ossl_got_transport_params(SSL *ssl, const unsigned char *params,
+                                             size_t params_len, void *arg)
+{
+       int ret = 0;
+       struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
+
+       TRACE_ENTER(QUIC_EV_TRANSP_PARAMS, qc);
+       TRACE_LEAVE(QUIC_EV_TRANSP_PARAMS, qc);
+
+       return ret;
+}
+
+static int ha_quic_ossl_alert(SSL *ssl, unsigned char alert_code, void *arg)
+{
+       int ret = 1, alert = alert_code;
+       struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
+
+       TRACE_ENTER(QUIC_EV_CONN_SSLALERT, qc);
+
+       TRACE_PROTO("Received TLS alert", QUIC_EV_CONN_SSLALERT, qc, &alert);
+       quic_set_tls_alert(qc, alert_code);
+
+       TRACE_LEAVE(QUIC_EV_CONN_SSLALERT, qc);
+
+       return ret;
+}
+
+static const OSSL_DISPATCH ha_quic_dispatch[] = {
+       {
+               OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_SEND,
+               (OSSL_FUNC)ha_quic_ossl_crypto_send,
+       },
+       {
+               OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RECV_RCD,
+               (OSSL_FUNC)ha_quic_ossl_crypto_recv_rcd,
+       },
+       {
+               OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RELEASE_RCD,
+               (OSSL_FUNC)ha_quic_ossl_crypto_release_rcd,
+       },
+       {
+               OSSL_FUNC_SSL_QUIC_TLS_YIELD_SECRET,
+               (OSSL_FUNC)ha_quic_ossl_yield_secret,
+       },
+       {
+               OSSL_FUNC_SSL_QUIC_TLS_GOT_TRANSPORT_PARAMS,
+               (OSSL_FUNC)ha_quic_ossl_got_transport_params,
+       },
+       {
+               OSSL_FUNC_SSL_QUIC_TLS_ALERT,
+               (OSSL_FUNC)ha_quic_ossl_alert,
+       },
+       OSSL_DISPATCH_END,
+};
+#else /* !HAVE_OPENSSL_QUIC */
+/***************************** QUICTLS QUIC API ******************************/
+
+#if defined(OPENSSL_IS_AWSLC)
+/* compatibility function for split read/write encryption secrets to be used
+ * with the API which uses 2 callbacks. */
+static inline int ha_quic_set_read_secret(SSL *ssl, enum ssl_encryption_level_t level,
+                                   const SSL_CIPHER *cipher, const uint8_t *secret,
+                                   size_t secret_len)
+{
+       return ha_quic_set_encryption_secrets(ssl, level, secret, NULL, secret_len);
+
+}
+
+static inline int ha_quic_set_write_secret(SSL *ssl, enum ssl_encryption_level_t level,
+                                   const SSL_CIPHER *cipher, const uint8_t *secret,
+                                   size_t secret_len)
+{
+
+       return ha_quic_set_encryption_secrets(ssl, level, NULL, secret, secret_len);
+
+}
+#endif
+
 static int ha_quic_flush_flight(SSL *ssl)
 {
        struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
@@ -432,6 +542,7 @@ static SSL_QUIC_METHOD ha_quic_method = {
        .send_alert             = ha_quic_send_alert,
 };
 #endif
+#endif /* HAVE_OPENSSL_QUIC */
 
 /* Initialize the TLS context of a listener with <bind_conf> as configuration.
  * Returns an error count.
@@ -533,11 +644,13 @@ static int qc_ssl_provide_quic_data(struct ncbuf *ncbuf,
 
        TRACE_ENTER(QUIC_EV_CONN_SSLDATA, qc);
 
+#ifndef HAVE_OPENSSL_QUIC
        if (SSL_provide_quic_data(ctx->ssl, level, data, len) != 1) {
                TRACE_ERROR("SSL_provide_quic_data() error",
                            QUIC_EV_CONN_SSLDATA, qc, NULL, NULL, ctx->ssl);
                goto leave;
        }
+#endif
 
        state = qc->state;
        if (state < QUIC_HS_ST_COMPLETE) {
@@ -645,7 +758,9 @@ static int qc_ssl_provide_quic_data(struct ncbuf *ncbuf,
                        TRACE_ERROR("quic_tls_key_update() failed", QUIC_EV_CONN_IO_CB, qc);
                        goto leave;
                }
-       } else {
+       }
+#ifndef HAVE_OPENSSL_QUIC
+       else {
                ssl_err = SSL_process_quic_post_handshake(ctx->ssl);
                if (ssl_err != 1) {
                        ssl_err = SSL_get_error(ctx->ssl, ssl_err);
@@ -662,6 +777,7 @@ static int qc_ssl_provide_quic_data(struct ncbuf *ncbuf,
 
                TRACE_STATE("SSL post handshake succeeded", QUIC_EV_CONN_IO_CB, qc, &state);
        }
+#endif
 
  out:
        ret = 1;
@@ -733,6 +849,16 @@ int qc_ssl_provide_all_quic_data(struct quic_conn *qc, struct ssl_sock_ctx *ctx)
        return ret;
 }
 
+/* Simple helper to set the specifig OpenSSL/quictls QUIC API callbacks */
+int quic_ssl_set_tls_cbs(SSL *ssl)
+{
+#ifdef HAVE_OPENSSL_QUIC
+       return SSL_set_quic_tls_cbs(ssl, ha_quic_dispatch, NULL);
+#else
+       return SSL_set_quic_method(ssl, &ha_quic_method);
+#endif
+}
+
 /* Try to allocate the <*ssl> SSL session object for <qc> QUIC connection
  * with <ssl_ctx> as SSL context inherited settings. Also set the transport
  * parameters of this session.
@@ -759,7 +885,7 @@ static int qc_ssl_sess_init(struct quic_conn *qc, SSL_CTX *ssl_ctx, SSL **ssl)
        }
 
        if (!SSL_set_ex_data(*ssl, ssl_qc_app_data_index, qc) ||
-           !SSL_set_quic_method(*ssl, &ha_quic_method)) {
+           !quic_ssl_set_tls_cbs(*ssl)) {
                SSL_free(*ssl);
                *ssl = NULL;
                if (!retry--)