Mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2026-01-18 17:11:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

stitch in ssls for SSL_listen_ex

Browse Source 
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27397)
This commit is contained in:
Neil Horman
2025-04-11 16:44:41 -04:00
parent 3d3021afdf
commit 974d007698
4 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/internal/quic_channel.h
View File

@@ -319,6 +319,9 @@ OSSL_STATM *ossl_quic_channel_get_statm(QUIC_CHANNEL *ch);
/* Gets the TLS handshake layer used with the channel. */
SSL *ossl_quic_channel_get0_tls(QUIC_CHANNEL *ch);
/* Sets the TLS handshake layer used for the channel */
void ossl_quic_channel_set0_tls(QUIC_CHANNEL *ch, SSL *ssl);
/* Gets the channels short header connection id length */
size_t ossl_quic_channel_get_short_header_conn_id_len(QUIC_CHANNEL *ch);

6
ssl/quic/quic_channel.c
View File

@@ -561,6 +561,12 @@ SSL *ossl_quic_channel_get0_tls(QUIC_CHANNEL *ch)
return ch->tls;
}
void ossl_quic_channel_set0_tls(QUIC_CHANNEL *ch, SSL *ssl)
{
SSL_free(ch->tls);
ch->tls = ssl;
}
static void free_buf_mem(unsigned char *buf, size_t buf_len, void *arg)
{
BUF_MEM_free((BUF_MEM *)arg);

52
ssl/quic/quic_impl.c
View File

@@ -410,6 +410,11 @@ static int expect_quic_cs(const SSL *s, QCTX *ctx)
return expect_quic_as(s, ctx, QCTX_C | QCTX_S);
}
static int expect_quic_c(const SSL *s, QCTX *ctx)
{
return expect_quic_as(s, ctx, QCTX_C);
}
static int expect_quic_csl(const SSL *s, QCTX *ctx)
{
return expect_quic_as(s, ctx, QCTX_C | QCTX_S | QCTX_L);
@@ -4634,13 +4639,16 @@ int ossl_quic_peeloff_conn(SSL *listener, SSL *new_conn)
QCTX lctx;
QCTX cctx;
QUIC_CHANNEL *new_ch;
QUIC_CONNECTION *qc = NULL;
QUIC_LISTENER *ql = NULL;
SSL *tls = NULL;
int ret = 0;
if (!expect_quic_listener(listener, &lctx))
return 0;
return -1;
if (!expect_quic_cs(new_conn, &cctx))
return 0;
if (!expect_quic_c(new_conn, &cctx))
return -1;
qctx_lock_for_io(&lctx);
if (ossl_quic_port_get_using_peeloff(lctx.ql->port) == -1) {
@@ -4653,9 +4661,37 @@ int ossl_quic_peeloff_conn(SSL *listener, SSL *new_conn)
ossl_quic_port_set_using_peeloff(lctx.ql->port, 1);
new_ch = ossl_quic_port_pop_incoming(lctx.ql->port);
if (new_ch != NULL) {
/*
* Do our cloning work here
*/
qc = cctx.qc;
ql = lctx.ql;
ossl_quic_channel_free(qc->ch);
ossl_quic_port_free(qc->port);
ossl_quic_engine_free(qc->engine);
qc->obj.engine = ql->engine;
qc->engine = ql->engine;
qc->port = ql->port;
qc->pending = 1;
#if defined(OPENSSL_THREADS)
ossl_crypto_mutex_free(&qc->mutex);
qc->mutex = ql->mutex;
#endif
qc->ch = new_ch;
tls = ossl_ssl_connection_new_int(ossl_quic_port_get_channel_ctx(lctx.ql->port),
new_conn, TLS_method());
if (tls == NULL)
goto out;
SSL_free(qc->tls);
ossl_quic_channel_set0_tls(new_ch, tls);
qc->tls = tls;
ossl_quic_channel_get_peer_addr(new_ch, &qc->init_peer_addr); /* best effort */
qc->started = 1;
qc->as_server = 1;
qc->as_server_state = 1;
qc->default_stream_mode = SSL_DEFAULT_STREAM_MODE_AUTO_BIDI;
qc->default_ssl_options = ql->obj.ssl.ctx->options & OSSL_QUIC_PERMITTED_OPTIONS;
qc->incoming_stream_policy = SSL_INCOMING_STREAM_POLICY_AUTO;
qc->last_error = SSL_ERROR_NONE;
qc_update_reject_policy(qc);
ret = 1;
}
out:
qctx_unlock(&lctx);
@@ -4701,9 +4737,9 @@ SSL *ossl_quic_accept_connection(SSL *ssl, uint64_t flags)
if (ossl_quic_port_get_using_peeloff(ctx.ql->port) == 1) {
QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
"This listener is using SSL_accept_ex");
goto out;
goto out;
}
ossl_quic_port_set_using_peeloff(ctx.ql->port, -1);
/* Wait for an incoming connection if needed. */

9
ssl/ssl_lib.c
View File

@@ -8059,16 +8059,19 @@ int SSL_get_peer_addr(SSL *ssl, BIO_ADDR *peer_addr)
return ossl_quic_get_peer_addr(ssl, peer_addr);
#else
return 0;
#endif
}
int SSL_listen_ex(SSL *listener, SSL *new_conn)
{
#ifndef OPENSSL_NO_QUIC
if (!IS_QUIC(listener) || !IS_QUIC(new_conn))
if (IS_QUIC(listener) && IS_QUIC(new_conn))
return ossl_quic_peeloff_conn(listener, new_conn);
#else
return 0;
else
#endif
ERR_raise_data(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT,
"SSL_listen_ex only operates on QUIC SSL objects");
return 0;
}
int SSL_listen(SSL *ssl)