From: Matt Caswell <matt@openssl.org>
Date: Thu, 10 Nov 2022 14:25:21 +0000 (+0000)
Subject: Move recordmethod.h to be an "internal" header
X-Git-Tag: openssl-3.2.0-alpha1~1396
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca20f61fd7cc424f1fd52d6471cf8d801229acf2;p=thirdparty%2Fopenssl.git

Move recordmethod.h to be an "internal" header

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

diff --git a/ssl/record/recordmethod.h b/include/internal/recordmethod.h
similarity index 100%
rename from ssl/record/recordmethod.h
rename to include/internal/recordmethod.h
diff --git a/ssl/record/record.h b/ssl/record/record.h
index 06838146e8c..419e322f510 100644
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -10,7 +10,7 @@
 typedef struct ssl_connection_st SSL_CONNECTION;
 
 #include <openssl/core_dispatch.h>
-#include "recordmethod.h"
+#include "internal/recordmethod.h"
 
 /*****************************************************************************
  *                                                                           *
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index fabf844601d..72aab22be81 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -28,7 +28,7 @@
 # include <openssl/symhacks.h>
 # include <openssl/ct.h>
 # include "record/record.h"
-# include "record/recordmethod.h"
+# include "internal/recordmethod.h"
 # include "statem/statem.h"
 # include "internal/packet.h"
 # include "internal/dane.h"
diff --git a/test/sslbuffertest.c b/test/sslbuffertest.c
index 6b6bf19292b..beace8ffd64 100644
--- a/test/sslbuffertest.c
+++ b/test/sslbuffertest.c
@@ -16,7 +16,7 @@
 /* We include internal headers so we can check if the buffers are allocated */
 #include "../ssl/ssl_local.h"
 #include "../ssl/record/record_local.h"
-#include "../ssl/record/recordmethod.h"
+#include "internal/recordmethod.h"
 #include "../ssl/record/methods/recmethod_local.h"
 
 #include "internal/packet.h"
diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index e6502c4b653..b25dae88f03 100644
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c
@@ -11,7 +11,7 @@
 #include <openssl/evp.h>
 #include "../ssl/ssl_local.h"
 #include "../ssl/record/record_local.h"
-#include "../ssl/record/recordmethod.h"
+#include "internal/recordmethod.h"
 #include "../ssl/record/methods/recmethod_local.h"
 #include "internal/nelem.h"
 #include "testutil.h"