diff options
author | jsing <> | 2021-05-16 10:55:17 +0000 |
---|---|---|
committer | jsing <> | 2021-05-16 10:55:17 +0000 |
commit | d137fa7fa05c81ef9436f77118c7175b4d21ad9a (patch) | |
tree | fc7528bc7ba19d9333869135c50942e9b79073f5 /src/lib/libssl/ssl_locl.h | |
parent | ff561112246739bbef361b6d774791837e3c4506 (diff) | |
download | openbsd-d137fa7fa05c81ef9436f77118c7175b4d21ad9a.tar.gz openbsd-d137fa7fa05c81ef9436f77118c7175b4d21ad9a.tar.bz2 openbsd-d137fa7fa05c81ef9436f77118c7175b4d21ad9a.zip |
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.
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index ad21a3d28d..52daec611f 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.344 2021/05/16 08:24:21 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.345 2021/05/16 10:55:17 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -162,7 +162,6 @@ | |||
162 | #include <openssl/stack.h> | 162 | #include <openssl/stack.h> |
163 | 163 | ||
164 | #include "bytestring.h" | 164 | #include "bytestring.h" |
165 | #include "ssl_sigalgs.h" | ||
166 | #include "tls13_internal.h" | 165 | #include "tls13_internal.h" |
167 | 166 | ||
168 | __BEGIN_HIDDEN_DECLS | 167 | __BEGIN_HIDDEN_DECLS |
@@ -417,6 +416,8 @@ typedef struct cert_pkey_st { | |||
417 | STACK_OF(X509) *chain; | 416 | STACK_OF(X509) *chain; |
418 | } CERT_PKEY; | 417 | } CERT_PKEY; |
419 | 418 | ||
419 | struct ssl_sigalg; | ||
420 | |||
420 | typedef struct ssl_handshake_tls12_st { | 421 | typedef struct ssl_handshake_tls12_st { |
421 | /* Used when SSL_ST_FLUSH_DATA is entered. */ | 422 | /* Used when SSL_ST_FLUSH_DATA is entered. */ |
422 | int next_state; | 423 | int next_state; |