From 7dfb3cbfd9466a233af49cabb7ada327930dbd2b Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Sun, 16 May 2021 08:32:49 +0000
Subject: [PATCH] Remove unnecessary includes from the bytestring APIs.

The bytestring APIs are self contained, hence including openssl headers
here is unnecessary.
---
 lib/libssl/bs_ber.c     | 4 +---
 lib/libssl/bs_cbb.c     | 4 +---
 lib/libssl/bs_cbs.c     | 6 +-----
 lib/libssl/bytestring.h | 4 +---
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/lib/libssl/bs_ber.c b/lib/libssl/bs_ber.c
index 7863b8be0cd..bc8b09dbdb5 100644
--- a/lib/libssl/bs_ber.c
+++ b/lib/libssl/bs_ber.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bs_ber.c,v 1.9 2016/12/03 12:34:35 jsing Exp $	*/
+/*	$OpenBSD: bs_ber.c,v 1.10 2021/05/16 08:32:49 jsing Exp $	*/
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -16,8 +16,6 @@
 
 #include <string.h>
 
-#include <openssl/opensslconf.h>
-
 #include "bytestring.h"
 
 /*
diff --git a/lib/libssl/bs_cbb.c b/lib/libssl/bs_cbb.c
index 62e98cb4762..75ea8d20e26 100644
--- a/lib/libssl/bs_cbb.c
+++ b/lib/libssl/bs_cbb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bs_cbb.c,v 1.24 2021/01/04 19:19:12 tb Exp $	*/
+/*	$OpenBSD: bs_cbb.c,v 1.25 2021/05/16 08:32:49 jsing Exp $	*/
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -17,8 +17,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/opensslconf.h>
-
 #include "bytestring.h"
 
 #define CBB_INITIAL_SIZE 64
diff --git a/lib/libssl/bs_cbs.c b/lib/libssl/bs_cbs.c
index 5c3b9e3ec6c..48120dd7e54 100644
--- a/lib/libssl/bs_cbs.c
+++ b/lib/libssl/bs_cbs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bs_cbs.c,v 1.18 2019/01/23 22:20:40 beck Exp $	*/
+/*	$OpenBSD: bs_cbs.c,v 1.19 2021/05/16 08:32:49 jsing Exp $	*/
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -17,10 +17,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/opensslconf.h>
-#include <openssl/buffer.h>
-#include <openssl/crypto.h>
-
 #include "bytestring.h"
 
 void
diff --git a/lib/libssl/bytestring.h b/lib/libssl/bytestring.h
index 20ee43999d5..ba73d484ed2 100644
--- a/lib/libssl/bytestring.h
+++ b/lib/libssl/bytestring.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bytestring.h,v 1.17 2018/08/16 18:39:37 jsing Exp $	*/
+/*	$OpenBSD: bytestring.h,v 1.18 2021/05/16 08:32:49 jsing Exp $	*/
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -20,8 +20,6 @@
 #include <sys/types.h>
 #include <stdint.h>
 
-#include <openssl/opensslconf.h>
-
 __BEGIN_HIDDEN_DECLS
 
 /*
-- 
2.20.1