From 8a1a6d6d9e9a6bc091f0dc21503da214e2614209 Mon Sep 17 00:00:00 2001 From: Hugo Landau Date: Wed, 30 Nov 2022 08:00:19 +0000 Subject: [PATCH] QUIC Front End I/O API: Wire up SSL_CTX ctrls and remove unneeded functions Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/19703) --- include/internal/quic_ssl.h | 2 -- ssl/quic/quic_impl.c | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/include/internal/quic_ssl.h b/include/internal/quic_ssl.h index 254972b1c5..899aca5b35 100644 --- a/include/internal/quic_ssl.h +++ b/include/internal/quic_ssl.h @@ -40,8 +40,6 @@ int ossl_quic_renegotiate_check(SSL *ssl, int initok); typedef struct quic_conn_st QUIC_CONNECTION; -__owur QUIC_CONNECTION *ossl_quic_conn_from_ssl(SSL *ssl); - int ossl_quic_do_handshake(QUIC_CONNECTION *qc); void ossl_quic_set_connect_state(QUIC_CONNECTION *qc); void ossl_quic_set_accept_state(QUIC_CONNECTION *qc); diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index aac427bc49..172edb473a 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -1159,23 +1159,18 @@ long ossl_quic_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) { switch (cmd) { default: - return 0; + return ssl3_ctx_ctrl(ctx, cmd, larg, parg); } } long ossl_quic_callback_ctrl(SSL *s, int cmd, void (*fp) (void)) { - return 0; + return ssl3_callback_ctrl(s, cmd, fp); } long ossl_quic_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void)) { - return 0; -} - -QUIC_CONNECTION *ossl_quic_conn_from_ssl(SSL *ssl) -{ - return QUIC_CONNECTION_FROM_SSL(ssl); + return ssl3_ctx_callback_ctrl(ctx, cmd, fp); } int ossl_quic_renegotiate_check(SSL *ssl, int initok) -- 2.39.5