From: Hugo Landau <hlandau@openssl.org>
Date: Thu, 18 Jan 2024 15:31:41 +0000 (+0000)
Subject: Minor fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34937918bd3687739b5d58c894033c007bf52963;p=thirdparty%2Fopenssl.git

Minor fixes

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23334)
---

diff --git a/include/internal/quic_predef.h b/include/internal/quic_predef.h
index f4fe0f606e8..9e3fd7255b8 100644
--- a/include/internal/quic_predef.h
+++ b/include/internal/quic_predef.h
@@ -39,6 +39,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 e233032dddf..dff1c485cf3 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -3065,7 +3065,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 ba9bfb480c0..52f5f544a6c 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 51ff81d5730..29d1f4c86e9 100644
--- a/test/build.info
+++ b/test/build.info
@@ -1210,7 +1210,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 <openssl/ssl.h>
 #include "internal/nelem.h"
+#include "internal/ssl_unwrap.h"
 #include "helpers/ssltestlib.h"
 #include "testutil.h"
 #include "../ssl/ssl_local.h"