3 files changed, 13 insertions, 46 deletions

diff --git a/src/lib/libcrypto/man/X509_NAME_print_ex.3 b/src/lib/libcrypto/man/X509_NAME_print_ex.3
index f1b3262f2a..6634e6f585 100644
--- a/src/lib/libcrypto/man/X509_NAME_print_ex.3
+++ b/src/lib/libcrypto/man/X509_NAME_print_ex.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_NAME_print_ex.3,v 1.14 2025/01/08 00:08:02 tb Exp $
+.\" $OpenBSD: X509_NAME_print_ex.3,v 1.15 2025/03/09 14:02:46 tb Exp $
 .\" full merge up to: OpenSSL aebb9aac Jul 19 09:27:53 2016 -0400
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -50,14 +50,13 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 8 2025 $
+.Dd $Mdocdate: March 9 2025 $
 .Dt X509_NAME_PRINT_EX 3
 .Os
 .Sh NAME
 .Nm X509_NAME_print_ex ,
 .Nm X509_NAME_print_ex_fp ,
 .Nm X509_NAME_oneline ,
-.Nm X509_NAME_print
 .Nd X509_NAME printing routines
 .Sh SYNOPSIS
 .In openssl/x509.h
@@ -81,12 +80,6 @@
 .Fa "char *buf"
 .Fa "int size"
 .Fc
-.Ft int
-.Fo X509_NAME_print
-.Fa "BIO *bp"
-.Fa "const X509_NAME *name"
-.Fa "int obase"
-.Fc
 .Sh DESCRIPTION
 .Fn X509_NAME_print_ex
 prints a human readable version of
@@ -127,24 +120,11 @@ bytes will be written, including the ending NUL, and
 .Fa buf
 is returned.
 .Pp
-.Fn X509_NAME_print
-prints out
-.Fa name
-to
-.Fa bp .
-The
-.Fa obase
-argument is intended to indent the output,
-it is however ignored.
-.Pp
-The functions
 .Fn X509_NAME_oneline
-and
-.Fn X509_NAME_print
-are legacy functions which produce a non-standard output form.
-They don't handle multi-character fields and have various quirks
+is a legacy functions which produce a non-standard output form.
+It doesn't handle multi-character fields and has various quirks
 and inconsistencies.
-Their use is strongly discouraged in new applications.
+Its use is strongly discouraged in new applications.
 .Pp
 Although there are a large number of possible flags, for most purposes
 .Dv XN_FLAG_ONELINE ,
@@ -247,11 +227,7 @@ is a multiline format which is the same as:
 .Dv XN_FLAG_SPC_EQ | XN_FLAG_FN_LN | XN_FLAG_FN_ALIGN .
 .Pp
 .Dv XN_FLAG_COMPAT
-uses a format identical to
-.Fn X509_NAME_print :
-in fact it calls
-.Fn X509_NAME_print
-internally.
+uses the traditional non-standard SSLeay format.
 .Sh RETURN VALUES
 .Fn X509_NAME_print_ex
 and
@@ -267,9 +243,6 @@ indentation or \-1 on error.
 returns a valid string on success or
 .Dv NULL
 on error.
-.Pp
-.Fn X509_NAME_print
-returns 1 on success or 0 on error.
 .Sh SEE ALSO
 .Xr ASN1_STRING_print_ex 3 ,
 .Xr d2i_X509_NAME 3 ,
@@ -277,9 +250,7 @@ returns 1 on success or 0 on error.
 .Xr X509_NAME_new 3
 .Sh HISTORY
 .Fn X509_NAME_oneline
-and
-.Fn X509_NAME_print
-first appeared in SSLeay 0.5.1 and have been available since
+first appeared in SSLeay 0.5.1 and has been available since
 .Ox 2.4 .
 .Pp
 .Fn X509_NAME_print_ex
diff --git a/src/lib/libcrypto/man/X509_REQ_print_ex.3 b/src/lib/libcrypto/man/X509_REQ_print_ex.3
index b8fb690cc7..eee06abb21 100644
--- a/src/lib/libcrypto/man/X509_REQ_print_ex.3
+++ b/src/lib/libcrypto/man/X509_REQ_print_ex.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_REQ_print_ex.3,v 1.2 2021/11/19 15:50:46 schwarze Exp $
+.\" $OpenBSD: X509_REQ_print_ex.3,v 1.3 2025/03/09 14:02:46 tb Exp $
 .\"
 .\" Copyright (c) 2021 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 19 2021 $
+.Dd $Mdocdate: March 9 2025 $
 .Dt X509_REQ_PRINT_EX 3
 .Os
 .Sh NAME
@@ -125,9 +125,7 @@ the
 .Fa indent
 argument of
 .Xr X509_NAME_print_ex 3
-is set to 16 spaces and the traditional SSLeay format generated by
-.Xr X509_NAME_print 3
-is used.
+is set to 16 spaces and the traditional SSLeay format is used.
 Otherwise, if the only bit set in
 .Dv XN_FLAG_SEP_MASK
 is
diff --git a/src/lib/libcrypto/man/X509_print_ex.3 b/src/lib/libcrypto/man/X509_print_ex.3
index 1a2e0edbdf..c769e77c32 100644
--- a/src/lib/libcrypto/man/X509_print_ex.3
+++ b/src/lib/libcrypto/man/X509_print_ex.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_print_ex.3,v 1.4 2021/10/29 09:42:07 schwarze Exp $
+.\" $OpenBSD: X509_print_ex.3,v 1.5 2025/03/09 14:02:46 tb Exp $
 .\"
 .\" Copyright (c) 2021 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 29 2021 $
+.Dd $Mdocdate: March 9 2025 $
 .Dt X509_PRINT_EX 3
 .Os
 .Sh NAME
@@ -163,9 +163,7 @@ the
 .Fa indent
 argument of
 .Xr X509_NAME_print_ex 3
-is set to 16 spaces and the traditional SSLeay format generated by
-.Xr X509_NAME_print 3
-is used.
+is set to 16 spaces and the traditional SSLeay format is used.
 Otherwise, if the only bit set in
 .Dv XN_FLAG_SEP_MASK
 is