From afa268daab7803faa5d66e8692a9a14e96698389 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 29 Mar 2024 02:22:18 +0000
Subject: Stop using pem2.h.

Somewhere in the past 25 years, the circular dependency between err and pem
went away. Stop pulling in pem2.h and just use pem.h directly (pem2.h can
probably be removed at some point, but that remains for another day).

ok joshua@ tb@
---
 src/lib/libcrypto/err/err_all.c | 4 ++--
 src/lib/libcrypto/pem/pem.h     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index ea6c0af409..9f135a2f58 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err_all.c,v 1.35 2024/03/24 06:05:41 tb Exp $ */
+/* $OpenBSD: err_all.c,v 1.36 2024/03/29 02:22:18 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -74,7 +74,7 @@
 #include <openssl/kdf.h>
 #include <openssl/objects.h>
 #include <openssl/ocsp.h>
-#include <openssl/pem2.h>
+#include <openssl/pem.h>
 #include <openssl/pkcs12.h>
 #include <openssl/rand.h>
 #include <openssl/ts.h>
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h
index 130acbccf4..af841caee6 100644
--- a/src/lib/libcrypto/pem/pem.h
+++ b/src/lib/libcrypto/pem/pem.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem.h,v 1.26 2023/04/25 17:51:36 tb Exp $ */
+/* $OpenBSD: pem.h,v 1.27 2024/03/29 02:22:18 jsing Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -69,7 +69,6 @@
 #endif
 #include <openssl/evp.h>
 #include <openssl/x509.h>
-#include <openssl/pem2.h>
 
 #ifdef  __cplusplus
 extern "C" {
-- 
cgit v1.2.3-55-g6feb