Avoid pulling ssl_sigalgs.h in via ssl_locl.h.

Forward declare struct sigalg in ssl_locl.h and avoid including
ssl_sigalgs.h. Explicitly include ssl_sigalgs.h where it is needed.

diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h
index ad21a3d..52daec6 100644 (file)
--- a/lib/libssl/ssl_locl.h
+++ b/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.344 2021/05/16 08:24:21 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.345 2021/05/16 10:55:17 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -162,7 +162,6 @@
 #include <openssl/stack.h>
 
 #include "bytestring.h"
-#include "ssl_sigalgs.h"
 #include "tls13_internal.h"
 
 __BEGIN_HIDDEN_DECLS
@@ -417,6 +416,8 @@ typedef struct cert_pkey_st {
        STACK_OF(X509) *chain;
 } CERT_PKEY;
 
+struct ssl_sigalg;
+
 typedef struct ssl_handshake_tls12_st {
        /* Used when SSL_ST_FLUSH_DATA is entered. */
        int next_state;

diff --git a/lib/libssl/tls13_client.c b/lib/libssl/tls13_client.c
index e0febee..05a6fbc 100644 (file)
--- a/lib/libssl/tls13_client.c
+++ b/lib/libssl/tls13_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_client.c,v 1.77 2021/03/29 16:46:09 jsing Exp $ */
+/* $OpenBSD: tls13_client.c,v 1.78 2021/05/16 10:55:17 jsing Exp $ */
 /*
  * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
  *
@@ -20,6 +20,7 @@
 #include <openssl/ssl3.h>
 
 #include "bytestring.h"
+#include "ssl_sigalgs.h"
 #include "ssl_tlsext.h"
 #include "tls13_handshake.h"
 #include "tls13_internal.h"

diff --git a/lib/libssl/tls13_server.c b/lib/libssl/tls13_server.c
index 4fed1a4..a1c0e12 100644 (file)
--- a/lib/libssl/tls13_server.c
+++ b/lib/libssl/tls13_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_server.c,v 1.74 2021/03/29 16:46:09 jsing Exp $ */
+/* $OpenBSD: tls13_server.c,v 1.75 2021/05/16 10:55:17 jsing Exp $ */
 /*
  * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
@@ -19,6 +19,7 @@
 #include <openssl/x509v3.h>
 
 #include "ssl_locl.h"
+#include "ssl_sigalgs.h"
 #include "ssl_tlsext.h"
 
 #include "tls13_handshake.h"