root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

QUIC APL: Add TODOs for unfinished listener APIs 

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23334)
This commit is contained in:
Hugo Landau 2024-01-18 15:23:38 +00:00 committed by Neil Horman
parent 56b59e7837
commit 7efebeb172
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/internal/quic_ssl.h
View File

@ -20,6 +20,7 @@
__owur SSL *ossl_quic_new(SSL_CTX *ctx); __owur SSL *ossl_quic_new(SSL_CTX *ctx);
__owur SSL *ossl_quic_new_listener(SSL_CTX *ctx, uint64_t flags); __owur SSL *ossl_quic_new_listener(SSL_CTX *ctx, uint64_t flags);
__owur SSL *ossl_quic_new_from_listener(SSL *ssl, uint64_t flags);
__owur int ossl_quic_init(SSL *s); __owur int ossl_quic_init(SSL *s);
void ossl_quic_deinit(SSL *s); void ossl_quic_deinit(SSL *s);
void ossl_quic_free(SSL *s); void ossl_quic_free(SSL *s);

19
ssl/quic/quic_impl.c
View File

@ -4022,6 +4022,10 @@ int ossl_quic_get_key_update_type(const SSL *s)
* ================================= * =================================
*/ */
/*
* SSL_new_listener
* ----------------
*/
SSL *ossl_quic_new_listener(SSL_CTX *ctx, uint64_t flags) SSL *ossl_quic_new_listener(SSL_CTX *ctx, uint64_t flags)
{ {
QUIC_LISTENER *ql = NULL; QUIC_LISTENER *ql = NULL;
@ -4056,6 +4060,8 @@ SSL *ossl_quic_new_listener(SSL_CTX *ctx, uint64_t flags)
goto err; goto err;
} }
/* TODO(QUIC SERVER): Implement SSL_LISTENER_FLAG_NO_ACCEPT */
ossl_quic_port_set_allow_incoming(ql->port, 1); ossl_quic_port_set_allow_incoming(ql->port, 1);
/* Initialise the QUIC_LISTENER'S object header. */ /* Initialise the QUIC_LISTENER'S object header. */
@ -4073,6 +4079,16 @@ err:
return NULL; return NULL;
} }
/*
* SSL_new_from_listener
* ---------------------
*/
SSL *ossl_quic_new_from_listener(SSL *ssl, uint64_t flags)
{
/* TODO(QUIC SERVER): Implement SSL_new_from_listener */
return NULL;
}
/* /*
* SSL_listen * SSL_listen
* ---------- * ----------
@ -4123,7 +4139,8 @@ SSL *ossl_quic_accept_connection(SSL *ssl, uint64_t flags)
if (!ql_listen(ctx.ql)) if (!ql_listen(ctx.ql))
goto out; goto out;
/* TODO autotick/block */ /* TODO(QUIC SERVER): Autotick */
/* TODO(QUIC SERVER): Implement blocking and SSL_ACCEPT_CONNECTION_NO_BLOCK */
new_ch = ossl_quic_port_pop_incoming(ctx.ql->port); new_ch = ossl_quic_port_pop_incoming(ctx.ql->port);
if (new_ch == NULL) { if (new_ch == NULL) {

12
ssl/ssl_lib.c
View File

@ -7910,6 +7910,18 @@ SSL *SSL_new_listener(SSL_CTX *ctx, uint64_t flags)
#endif #endif
} }
SSL *SSL_new_from_listener(SSL *ssl, uint64_t flags)
{
#ifndef OPENSSL_NO_QUIC
if (!IS_QUIC(ssl))
return NULL;
return ossl_quic_new_from_listener(ssl, flags);
#else
return NULL;
#endif
}
SSL *SSL_accept_connection(SSL *ssl, uint64_t flags) SSL *SSL_accept_connection(SSL *ssl, uint64_t flags)
{ {
#ifndef OPENSSL_NO_QUIC #ifndef OPENSSL_NO_QUIC