From 32cde93f0dc28a48ce68a8e611101b3e5e38e8d1 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Tue, 25 Apr 2023 17:51:36 +0000
Subject: [PATCH] Remove PEM wrappers for NETSCAPE_CERT_SEQUENCE

---
 lib/libcrypto/pem/pem.h     |  6 +-----
 lib/libcrypto/pem/pem_all.c | 32 +-------------------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/lib/libcrypto/pem/pem.h b/lib/libcrypto/pem/pem.h
index 092d815c58f..130acbccf4e 100644
--- a/lib/libcrypto/pem/pem.h
+++ b/lib/libcrypto/pem/pem.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem.h,v 1.25 2023/04/24 22:24:39 tb Exp $ */
+/* $OpenBSD: pem.h,v 1.26 2023/04/25 17:51:36 tb Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -425,10 +425,6 @@ DECLARE_PEM_rw(X509_CRL, X509_CRL)
 
 DECLARE_PEM_rw(PKCS7, PKCS7)
 
-#if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL)
-DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
-#endif
-
 DECLARE_PEM_rw(PKCS8, X509_SIG)
 
 DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
diff --git a/lib/libcrypto/pem/pem_all.c b/lib/libcrypto/pem/pem_all.c
index 2420bfa9734..9fa5184ec09 100644
--- a/lib/libcrypto/pem/pem_all.c
+++ b/lib/libcrypto/pem/pem_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_all.c,v 1.19 2023/04/25 11:03:37 tb Exp $ */
+/* $OpenBSD: pem_all.c,v 1.20 2023/04/25 17:51:36 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -239,36 +239,6 @@ PEM_write_bio_PKCS7(BIO *bp, PKCS7 *x)
 	    x, NULL, NULL, 0, NULL, NULL);
 }
 
-#if !defined(LIBRESSL_NEXT_API)
-int
-PEM_write_NETSCAPE_CERT_SEQUENCE(FILE *fp, NETSCAPE_CERT_SEQUENCE *x)
-{
-	return PEM_ASN1_write((i2d_of_void *)i2d_NETSCAPE_CERT_SEQUENCE, PEM_STRING_X509, fp,
-	    x, NULL, NULL, 0, NULL, NULL);
-}
-
-NETSCAPE_CERT_SEQUENCE *
-PEM_read_NETSCAPE_CERT_SEQUENCE(FILE *fp, NETSCAPE_CERT_SEQUENCE **x, pem_password_cb *cb, void *u)
-{
-	return PEM_ASN1_read((d2i_of_void *)d2i_NETSCAPE_CERT_SEQUENCE, PEM_STRING_X509, fp,
-	    (void **)x, cb, u);
-}
-
-NETSCAPE_CERT_SEQUENCE *
-PEM_read_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp, NETSCAPE_CERT_SEQUENCE **x, pem_password_cb *cb, void *u)
-{
-	return PEM_ASN1_read_bio((d2i_of_void *)d2i_NETSCAPE_CERT_SEQUENCE, PEM_STRING_X509, bp,
-	    (void **)x, cb, u);
-}
-
-int
-PEM_write_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp, NETSCAPE_CERT_SEQUENCE *x)
-{
-	return PEM_ASN1_write_bio((i2d_of_void *)i2d_NETSCAPE_CERT_SEQUENCE, PEM_STRING_X509, bp,
-	    x, NULL, NULL, 0, NULL, NULL);
-}
-#endif
-
 #ifndef OPENSSL_NO_RSA
 
 /* We treat RSA or DSA private keys as a special case.
-- 
2.20.1