From: Bob Beck <beck@openssl.org>
Date: Tue, 14 Apr 2026 18:07:20 +0000 (-0600)
Subject: Make ssl includes self-contained
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3a0dfa766397ebc9de5e2cf93102f95d1e3ece5;p=thirdparty%2Fopenssl.git

Make ssl includes self-contained

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Wed May  6 11:35:50 2026
(Merged from https://github.com/openssl/openssl/pull/31001)
---

diff --git a/ssl/ech/ech_local.h b/ssl/ech/ech_local.h
index 143742354a2..dff7a9160b8 100644
--- a/ssl/ech/ech_local.h
+++ b/ssl/ech/ech_local.h
@@ -20,6 +20,10 @@
 #include <openssl/ech.h>
 #include <openssl/hpke.h>
 
+#include <internal/packet.h>
+#include <internal/ssl.h>
+#include <internal/statem.h>
+
 /*
  * Define this to get loads more lines of tracing which is
  * very useful for interop.
diff --git a/ssl/record/record.h b/ssl/record/record.h
index 1f7ade3988e..192052367b0 100644
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -11,7 +11,9 @@
 #define OSSL_SSL_RECORD_RECORD_H
 
 #include <openssl/core_dispatch.h>
+
 #include "internal/recordmethod.h"
+#include "internal/statem.h"
 
 /*****************************************************************************
  *                                                                           *
diff --git a/ssl/ssl_cert_table.h b/ssl/ssl_cert_table.h
index 85517a749bd..940ef7a5c94 100644
--- a/ssl/ssl_cert_table.h
+++ b/ssl/ssl_cert_table.h
@@ -13,6 +13,10 @@
 #if !defined(OSSL_SSL_SSL_CERT_TABLE_H)
 #define OSSL_SSL_SSL_CERT_TABLE_H
 
+#include <openssl/evp.h>
+
+#include "ssl_local.h"
+
 static const SSL_CERT_LOOKUP ssl_cert_info[] = {
     { EVP_PKEY_RSA, SSL_aRSA }, /* SSL_PKEY_RSA */
     { EVP_PKEY_RSA_PSS, SSL_aRSA }, /* SSL_PKEY_RSA_PSS_SIGN */
diff --git a/ssl/statem/statem_local.h b/ssl/statem/statem_local.h
index c924269a037..68ac803fa96 100644
--- a/ssl/statem/statem_local.h
+++ b/ssl/statem/statem_local.h
@@ -14,11 +14,17 @@
  *                                                                           *
  *****************************************************************************/
 
+#if !defined(OSSL_SSL_STATEM_STATEM_LOCAL_H)
+#define OSSL_SSL_STATEM_STATEM_LOCAL_H
+
+#include <internal/packet.h>
+#include <internal/statem.h>
+
+#include "../ssl_local.h"
+
 /* Max message length definitions */
 
 /* The spec allows for a longer length than this, but we limit it */
-#if !defined(OSSL_SSL_STATEM_STATEM_LOCAL_H)
-#define OSSL_SSL_STATEM_STATEM_LOCAL_H
 
 #define HELLO_VERIFY_REQUEST_MAX_LENGTH 258
 #define END_OF_EARLY_DATA_MAX_LENGTH 0