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@

diff --git a/lib/libcrypto/err/err_all.c b/lib/libcrypto/err/err_all.c
index ea6c0af..9f135a2 100644 (file)
--- a/lib/libcrypto/err/err_all.c
+++ b/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/lib/libcrypto/pem/pem.h b/lib/libcrypto/pem/pem.h
index 130acbc..af841ca 100644 (file)
--- a/lib/libcrypto/pem/pem.h
+++ b/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" {