From de401f90b0cb4204d067ec72a696e6e107c48965 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Mon, 1 May 2023 07:37:45 +0000
Subject: [PATCH] Remove ASN1_item_ndef_i2d(3) documentation

This was the last public API explicitly named ndef/NDEF for indefinite
length encoding, so remove that explanation as well.
---
 lib/libcrypto/man/ASN1_item_d2i.3 | 24 +++---------------------
 lib/libcrypto/man/crypto.3        | 16 ++--------------
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/lib/libcrypto/man/ASN1_item_d2i.3 b/lib/libcrypto/man/ASN1_item_d2i.3
index a95950d7499..bc99f4a6da5 100644
--- a/lib/libcrypto/man/ASN1_item_d2i.3
+++ b/lib/libcrypto/man/ASN1_item_d2i.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ASN1_item_d2i.3,v 1.17 2023/04/28 15:51:18 job Exp $
+.\" $OpenBSD: ASN1_item_d2i.3,v 1.18 2023/05/01 07:37:45 tb Exp $
 .\" selective merge up to:
 .\" OpenSSL doc/man3/d2i_X509.pod 256989ce Jun 19 15:00:32 2020 +0200
 .\"
@@ -66,7 +66,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 28 2023 $
+.Dd $Mdocdate: May 1 2023 $
 .Dt ASN1_ITEM_D2I 3
 .Os
 .Sh NAME
@@ -77,7 +77,6 @@
 .Nm ASN1_item_i2d ,
 .Nm ASN1_item_i2d_bio ,
 .Nm ASN1_item_i2d_fp ,
-.Nm ASN1_item_ndef_i2d ,
 .Nm i2d_ASN1_TYPE ,
 .Nm ASN1_item_dup ,
 .Nm ASN1_item_print
@@ -128,12 +127,6 @@
 .Fa "void *val_in"
 .Fc
 .Ft int
-.Fo ASN1_item_ndef_i2d
-.Fa "ASN1_VALUE *val_in"
-.Fa "unsigned char **der_out"
-.Fa "const ASN1_ITEM *it"
-.Fc
-.Ft int
 .Fo i2d_ASN1_TYPE
 .Fa "ASN1_TYPE *val_in"
 .Fa "unsigned char **der_out"
@@ -270,12 +263,6 @@ or
 .Vt FILE ,
 respectively.
 .Pp
-.Fn ASN1_item_ndef_i2d
-is similar to
-.Fn ASN1_item_i2d
-except that it encodes using BER rather than DER,
-using the indefinite length form where appropriate.
-.Pp
 .Fn i2d_ASN1_TYPE
 is similar to
 .Fn ASN1_item_i2d
@@ -309,8 +296,7 @@ If an error occurs,
 .Dv NULL
 is returned.
 .Pp
-.Fn ASN1_item_i2d ,
-.Fn ASN1_item_ndef_i2d ,
+.Fn ASN1_item_i2d
 and
 .Fn i2d_ASN1_TYPE
 return the number of bytes written
@@ -403,10 +389,6 @@ and
 first appeared in OpenSSL 0.9.7 and have been available since
 .Ox 3.2 .
 .Pp
-.Fn ASN1_item_ndef_i2d
-first appeared in OpenSSL 0.9.8 and has been available since
-.Ox 4.5 .
-.Pp
 .Fn ASN1_item_print
 first appeared in OpenSSL 1.0.0 and has been available since
 .Ox 4.9 .
diff --git a/lib/libcrypto/man/crypto.3 b/lib/libcrypto/man/crypto.3
index f809347a6bc..e63c1a78dfe 100644
--- a/lib/libcrypto/man/crypto.3
+++ b/lib/libcrypto/man/crypto.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: crypto.3,v 1.28 2022/02/04 00:55:52 tb Exp $
+.\"	$OpenBSD: crypto.3,v 1.29 2023/05/01 07:37:45 tb Exp $
 .\"	OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100
 .\"
 .\" This file is a derived work.
@@ -66,7 +66,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 4 2022 $
+.Dd $Mdocdate: May 1 2023 $
 .Dt CRYPTO 3
 .Os
 .Sh NAME
@@ -337,18 +337,6 @@ in the same sense.
 See also the
 .Dq cb
 entry in the present list.
-.It ndef
-indefinite length form:
-The function encodes according to ASN.1 basic encoding rules (BER)
-using the indefinite length form.
-Even if the function name also includes
-.Dq i2d ,
-the output does not conform to ASN.1 distinguished encoding rules (DER).
-See
-.Xr ASN1_item_ndef_i2d 3 .
-Some function names contain the all caps version
-.Dq NDEF
-with the same meaning.
 .It nid
 numerical identifier:
 A non-standard, LibreSSL-specific
-- 
2.20.1