From: tb <tb@openbsd.org>
Date: Tue, 25 Apr 2023 18:04:03 +0000 (+0000)
Subject: Remove i2d_PKCS7_NDEF
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=fff5409121155edd9c58a861bc5bf7fa5fbf9d70;p=openbsd

Remove i2d_PKCS7_NDEF
---

diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace
index c68e8970de1..2e0a638f177 100644
--- a/lib/libcrypto/Symbols.namespace
+++ b/lib/libcrypto/Symbols.namespace
@@ -76,7 +76,6 @@ _libre_PKCS7_new
 _libre_PKCS7_free
 _libre_d2i_PKCS7
 _libre_i2d_PKCS7
-_libre_i2d_PKCS7_NDEF
 _libre_PKCS7_print_ctx
 _libre_PKCS7_ctrl
 _libre_PKCS7_set_type
diff --git a/lib/libcrypto/pkcs7/pk7_asn1.c b/lib/libcrypto/pkcs7/pk7_asn1.c
index f24f6be3477..27f41030253 100644
--- a/lib/libcrypto/pkcs7/pk7_asn1.c
+++ b/lib/libcrypto/pkcs7/pk7_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_asn1.c,v 1.16 2023/03/12 17:29:02 tb Exp $ */
+/* $OpenBSD: pk7_asn1.c,v 1.17 2023/04/25 18:04:03 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -245,13 +245,6 @@ PKCS7_free(PKCS7 *a)
 }
 LCRYPTO_ALIAS(PKCS7_free);
 
-int
-i2d_PKCS7_NDEF(PKCS7 *a, unsigned char **out)
-{
-	return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, &PKCS7_it);
-}
-LCRYPTO_ALIAS(i2d_PKCS7_NDEF);
-
 PKCS7 *
 PKCS7_dup(PKCS7 *x)
 {
diff --git a/lib/libcrypto/pkcs7/pkcs7.h b/lib/libcrypto/pkcs7/pkcs7.h
index b225562dc37..00a094f5e4f 100644
--- a/lib/libcrypto/pkcs7/pkcs7.h
+++ b/lib/libcrypto/pkcs7/pkcs7.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs7.h,v 1.20 2023/04/24 22:12:28 tb Exp $ */
+/* $OpenBSD: pkcs7.h,v 1.21 2023/04/25 18:04:03 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -321,9 +321,6 @@ extern const ASN1_ITEM PKCS7_it;
 extern const ASN1_ITEM PKCS7_ATTR_SIGN_it;
 extern const ASN1_ITEM PKCS7_ATTR_VERIFY_it;
 
-#if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL)
-int i2d_PKCS7_NDEF(PKCS7 *a, unsigned char **out);
-#endif
 int PKCS7_print_ctx(BIO *out, PKCS7 *x, int indent, const ASN1_PCTX *pctx);
 
 long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);