From: Matt Caswell <matt@openssl.org>
Date: Thu, 26 Jan 2023 15:19:40 +0000 (+0000)
Subject: Don't declare SSL_CONNECTION twice
X-Git-Tag: openssl-3.2.0-alpha1~1244
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6cf4b59a0f3c32d61828ee82c193494e13ff969;p=thirdparty%2Fopenssl.git

Don't declare SSL_CONNECTION twice

It causes problems with some compilation options

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20030)
---

diff --git a/ssl/record/record.h b/ssl/record/record.h
index cd2b78698db..8113d78da05 100644
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -7,8 +7,6 @@
  * https://www.openssl.org/source/license.html
  */
 
-typedef struct ssl_connection_st SSL_CONNECTION;
-
 #include <openssl/core_dispatch.h>
 #include "internal/recordmethod.h"
 
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index f28f4419efa..e82564daf61 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -27,7 +27,6 @@
 # include <openssl/async.h>
 # include <openssl/symhacks.h>
 # include <openssl/ct.h>
-# include "record/record.h"
 # include "internal/recordmethod.h"
 # include "internal/statem.h"
 # include "internal/packet.h"
@@ -37,6 +36,7 @@
 # include "internal/bio.h"
 # include "internal/ktls.h"
 # include "internal/time.h"
+# include "record/record.h"
 
 # ifdef OPENSSL_BUILD_SHLIBSSL
 #  undef OPENSSL_EXTERN