From d69917654f5cc73b352565d1d2c094ec88a65075 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Sun, 9 Jan 2022 23:50:10 +0000
Subject: [PATCH] Add an essentially empty comp_local.h and include it where it
 will be needed.

discussed with jsing
---
 lib/libcrypto/comp/c_rle.c      |  4 +++-
 lib/libcrypto/comp/c_zlib.c     |  4 +++-
 lib/libcrypto/comp/comp_err.c   |  4 +++-
 lib/libcrypto/comp/comp_lib.c   |  4 +++-
 lib/libcrypto/comp/comp_local.h | 10 ++++++++++
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 lib/libcrypto/comp/comp_local.h

diff --git a/lib/libcrypto/comp/c_rle.c b/lib/libcrypto/comp/c_rle.c
index 7004c350299..93b2f3c71bc 100644
--- a/lib/libcrypto/comp/c_rle.c
+++ b/lib/libcrypto/comp/c_rle.c
@@ -1,10 +1,12 @@
-/* $OpenBSD: c_rle.c,v 1.8 2014/11/03 16:58:28 tedu Exp $ */
+/* $OpenBSD: c_rle.c,v 1.9 2022/01/09 23:50:10 tb Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <openssl/objects.h>
 #include <openssl/comp.h>
 
+#include "comp_local.h"
+
 static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
     unsigned int olen, unsigned char *in, unsigned int ilen);
 static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
diff --git a/lib/libcrypto/comp/c_zlib.c b/lib/libcrypto/comp/c_zlib.c
index 0cdbb205a44..4c527d57de3 100644
--- a/lib/libcrypto/comp/c_zlib.c
+++ b/lib/libcrypto/comp/c_zlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_zlib.c,v 1.20 2018/03/17 16:20:01 beck Exp $ */
+/* $OpenBSD: c_zlib.c,v 1.21 2022/01/09 23:50:10 tb Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -6,6 +6,8 @@
 #include <openssl/comp.h>
 #include <openssl/err.h>
 
+#include "comp_local.h"
+
 COMP_METHOD *COMP_zlib(void );
 
 static COMP_METHOD zlib_method_nozlib = {
diff --git a/lib/libcrypto/comp/comp_err.c b/lib/libcrypto/comp/comp_err.c
index be8a8fc7083..ccc7a28cd36 100644
--- a/lib/libcrypto/comp/comp_err.c
+++ b/lib/libcrypto/comp/comp_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: comp_err.c,v 1.10 2017/01/29 17:49:22 beck Exp $ */
+/* $OpenBSD: comp_err.c,v 1.11 2022/01/09 23:50:10 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
  *
@@ -60,6 +60,8 @@
 #include <openssl/comp.h>
 #include <openssl/err.h>
 
+#include "comp_local.h"
+
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 
diff --git a/lib/libcrypto/comp/comp_lib.c b/lib/libcrypto/comp/comp_lib.c
index dde238ef728..3f914a75fa4 100644
--- a/lib/libcrypto/comp/comp_lib.c
+++ b/lib/libcrypto/comp/comp_lib.c
@@ -1,10 +1,12 @@
-/* $OpenBSD: comp_lib.c,v 1.8 2014/11/03 16:58:28 tedu Exp $ */
+/* $OpenBSD: comp_lib.c,v 1.9 2022/01/09 23:50:10 tb Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <openssl/objects.h>
 #include <openssl/comp.h>
 
+#include "comp_local.h"
+
 COMP_CTX *
 COMP_CTX_new(COMP_METHOD *meth)
 {
diff --git a/lib/libcrypto/comp/comp_local.h b/lib/libcrypto/comp/comp_local.h
new file mode 100644
index 00000000000..e1dfff1251f
--- /dev/null
+++ b/lib/libcrypto/comp/comp_local.h
@@ -0,0 +1,10 @@
+/* $OpenBSD: comp_local.h,v 1.1 2022/01/09 23:50:10 tb Exp $ */
+
+#ifndef HEADER_COMP_LOCAL_H
+#define HEADER_COMP_LOCAL_H
+
+__BEGIN_HIDDEN_DECLS
+
+__END_HIDDEN_DECLS
+
+#endif /* !HEADER_COMP_LOCAL_H */
-- 
2.20.1