From d1e81ca94cb02062dc49bbe49343ae2e902afe0b Mon Sep 17 00:00:00 2001 From: Hugo Landau Date: Thu, 18 Jan 2024 15:31:41 +0000 Subject: [PATCH] Minor fixes Reviewed-by: Matt Caswell Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/23334) --- include/internal/quic_predef.h | 2 ++ include/internal/quic_ssl.h | 5 +---- ssl/quic/quic_impl.c | 3 ++- ssl/ssl_cert_comp.c | 1 + test/build.info | 2 +- test/cert_comp_test.c | 1 + 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/internal/quic_predef.h b/include/internal/quic_predef.h index 899f60959a4..1f1012329d8 100644 --- a/include/internal/quic_predef.h +++ b/include/internal/quic_predef.h @@ -38,6 +38,8 @@ typedef struct quic_urxe_st QUIC_URXE; typedef struct quic_engine_st QUIC_ENGINE; typedef struct quic_obj_st QUIC_OBJ; typedef struct quic_conn_st QUIC_CONNECTION; +typedef struct quic_xso_st QUIC_XSO; +typedef struct quic_listener_st QUIC_LISTENER; # endif diff --git a/include/internal/quic_ssl.h b/include/internal/quic_ssl.h index ce7142c51f5..ae70233aeb8 100644 --- a/include/internal/quic_ssl.h +++ b/include/internal/quic_ssl.h @@ -15,6 +15,7 @@ # include "internal/quic_record_rx.h" /* OSSL_QRX */ # include "internal/quic_ackm.h" /* OSSL_ACKM */ # include "internal/quic_channel.h" /* QUIC_CHANNEL */ +# include "internal/quic_predef.h" # ifndef OPENSSL_NO_QUIC @@ -45,10 +46,6 @@ __owur int ossl_quic_num_ciphers(void); __owur const SSL_CIPHER *ossl_quic_get_cipher(unsigned int u); int ossl_quic_renegotiate_check(SSL *ssl, int initok); -typedef struct quic_conn_st QUIC_CONNECTION; -typedef struct quic_xso_st QUIC_XSO; -typedef struct quic_listener_st QUIC_LISTENER; - int ossl_quic_do_handshake(SSL *s); void ossl_quic_set_connect_state(SSL *s); void ossl_quic_set_accept_state(SSL *s); diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index 457d97af851..cbedf009682 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -3078,7 +3078,8 @@ SSL *ossl_quic_get0_listener(SSL *s) if (!expect_quic(s, &ctx)) return NULL; - return NULL; // XXX TODO + /* TODO(QUIC SERVER): Implement SSL_get0_listener */ + return NULL; } /* diff --git a/ssl/ssl_cert_comp.c b/ssl/ssl_cert_comp.c index 7bf49d435f5..010e03a702d 100644 --- a/ssl/ssl_cert_comp.c +++ b/ssl/ssl_cert_comp.c @@ -11,6 +11,7 @@ #include "ssl_local.h" #include "internal/e_os.h" #include "internal/refcount.h" +#include "internal/ssl_unwrap.h" size_t ossl_calculate_comp_expansion(int alg, size_t length) { diff --git a/test/build.info b/test/build.info index e14809f4b20..73dac5788fb 100644 --- a/test/build.info +++ b/test/build.info @@ -1245,7 +1245,7 @@ ENDIF SOURCE[cert_comp_test]=cert_comp_test.c helpers/ssltestlib.c INCLUDE[cert_comp_test]=../include ../apps/include .. - DEPEND[cert_comp_test]=../libcrypto ../libssl libtestutil.a + DEPEND[cert_comp_test]=../libcrypto.a ../libssl.a libtestutil.a SOURCE[x509_acert_test]=x509_acert_test.c INCLUDE[x509_acert_test]=../include ../apps/include diff --git a/test/cert_comp_test.c b/test/cert_comp_test.c index 5c385df8050..66c58709946 100644 --- a/test/cert_comp_test.c +++ b/test/cert_comp_test.c @@ -17,6 +17,7 @@ #include #include "internal/nelem.h" +#include "internal/ssl_unwrap.h" #include "helpers/ssltestlib.h" #include "testutil.h" #include "../ssl/ssl_local.h" -- 2.47.3