7 files changed, 12 insertions, 156 deletions

diff --git a/src/lib/libcrypto/man/EC_GFp_simple_method.3 b/src/lib/libcrypto/man/EC_GFp_simple_method.3
deleted file mode 100644
index fd9f71e7f4..0000000000
--- a/src/lib/libcrypto/man/EC_GFp_simple_method.3
+++ /dev/null
@@ -1,136 +0,0 @@
-.\"     $OpenBSD: EC_GFp_simple_method.3,v 1.12 2023/04/27 08:47:04 tb Exp $
-.\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
-.\"
-.\" This file was written by Matt Caswell <matt@openssl.org>.
-.\" Copyright (c) 2013 The OpenSSL Project.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\"
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" 3. All advertising materials mentioning features or use of this
-.\"    software must display the following acknowledgment:
-.\"    "This product includes software developed by the OpenSSL Project
-.\"    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-.\"
-.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-.\"    endorse or promote products derived from this software without
-.\"    prior written permission. For written permission, please contact
-.\"    openssl-core@openssl.org.
-.\"
-.\" 5. Products derived from this software may not be called "OpenSSL"
-.\"    nor may "OpenSSL" appear in their names without prior written
-.\"    permission of the OpenSSL Project.
-.\"
-.\" 6. Redistributions of any form whatsoever must retain the following
-.\"    acknowledgment:
-.\"    "This product includes software developed by the OpenSSL Project
-.\"    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-.\" OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: April 27 2023 $
-.Dt EC_GFP_SIMPLE_METHOD 3
-.Os
-.Sh NAME
-.Nm EC_GFp_simple_method ,
-.Nm EC_GFp_mont_method ,
-.Nm EC_METHOD_get_field_type
-.Nd obtain EC_METHOD objects
-.Sh SYNOPSIS
-.In openssl/ec.h
-.Ft const EC_METHOD *
-.Fn EC_GFp_simple_method void
-.Ft const EC_METHOD *
-.Fn EC_GFp_mont_method void
-.Ft int
-.Fo EC_METHOD_get_field_type
-.Fa "const EC_METHOD *meth"
-.Fc
-.Sh DESCRIPTION
-The elliptic curve library provides a number of different
-implementations through a single common interface.
-Each implementation is optimised for different scenarios.
-An implementation is represented by an
-.Vt EC_METHOD
-structure.
-.Pp
-When constructing a curve using
-.Xr EC_GROUP_new 3 ,
-an implementation method must be provided.
-The functions described here all return a const pointer to an
-.Sy EC_METHOD
-structure that can be passed to
-.Xr EC_GROUP_new 3 .
-It is important that the correct implementation type for the form
-of curve selected is used.
-.Pp
-For Fp curves the lowest common denominator implementation is the
-.Fn EC_GFp_simple_method
-implementation.
-All other implementations are based on this one.
-.Fn EC_GFp_mont_method
-adds the use of Montgomery multiplication (see
-.Xr BN_mod_mul_montgomery 3 ) .
-.Pp
-.Fn EC_METHOD_get_field_type
-identifies what type of field the
-.Vt EC_METHOD
-structure supports.
-If the field type is Fp, then the value
-.Dv NID_X9_62_prime_field
-is returned.
-If the field type is F2^m, then the value
-.Dv NID_X9_62_characteristic_two_field
-is returned.
-These values are defined in the
-.In openssl/objects.h
-header file.
-.Sh RETURN VALUES
-All
-.Fn EC_GFp*
-functions always return a const pointer to an
-.Vt EC_METHOD
-structure.
-.Pp
-.Fn EC_METHOD_get_field_type
-returns an integer that identifies the type of field the
-.Vt EC_METHOD
-structure supports.
-.Sh SEE ALSO
-.Xr BN_mod_mul_montgomery 3 ,
-.Xr d2i_ECPKParameters 3 ,
-.Xr EC_GROUP_copy 3 ,
-.Xr EC_GROUP_new 3 ,
-.Xr EC_KEY_new 3 ,
-.Xr EC_POINT_add 3 ,
-.Xr EC_POINT_new 3
-.Sh HISTORY
-.Fn EC_GFp_simple_method
-and
-.Fn EC_GFp_mont_method
-first appeared in OpenSSL 0.9.7 and have been available since
-.Ox 3.2 .
-.Pp
-.Fn EC_METHOD_get_field_type
-first appeared in OpenSSL 0.9.8 and has been available since
-.Ox 4.5 .
diff --git a/src/lib/libcrypto/man/EC_GROUP_copy.3 b/src/lib/libcrypto/man/EC_GROUP_copy.3
index c83ee3d5b1..c3333ad343 100644
--- a/src/lib/libcrypto/man/EC_GROUP_copy.3
+++ b/src/lib/libcrypto/man/EC_GROUP_copy.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EC_GROUP_copy.3,v 1.14 2023/06/28 18:07:07 tb Exp $
+.\" $OpenBSD: EC_GROUP_copy.3,v 1.15 2025/03/08 16:38:13 tb Exp $
 .\" full merge up to: OpenSSL d900a015 Oct 8 14:40:42 2015 +0200
 .\" selective merge up to: OpenSSL 24c23e1f Aug 22 10:51:25 2019 +0530
 .\"
@@ -51,7 +51,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 28 2023 $
+.Dd $Mdocdate: March 8 2025 $
 .Dt EC_GROUP_COPY 3
 .Os
 .Sh NAME
@@ -472,7 +472,6 @@ or -1 on error.
 always returns 0.
 .Sh SEE ALSO
 .Xr d2i_ECPKParameters 3 ,
-.Xr EC_GFp_simple_method 3 ,
 .Xr EC_GROUP_new 3 ,
 .Xr EC_KEY_new 3 ,
 .Xr EC_POINT_add 3 ,
diff --git a/src/lib/libcrypto/man/EC_GROUP_new.3 b/src/lib/libcrypto/man/EC_GROUP_new.3
index e6cfb9a73b..83e3e4c870 100644
--- a/src/lib/libcrypto/man/EC_GROUP_new.3
+++ b/src/lib/libcrypto/man/EC_GROUP_new.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: EC_GROUP_new.3,v 1.17 2024/04/27 07:41:47 tb Exp $
+.\"     $OpenBSD: EC_GROUP_new.3,v 1.18 2025/03/08 16:38:13 tb Exp $
 .\"     OpenSSL 6328d367 Sat Jul 4 21:58:30 2020 +0200
 .\"
 .\" This file was written by Matt Caswell <matt@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 27 2024 $
+.Dd $Mdocdate: March 8 2025 $
 .Dt EC_GROUP_NEW 3
 .Os
 .Sh NAME
@@ -154,9 +154,7 @@ structure is used to represent the definition of an elliptic curve.
 A new curve can be constructed by calling
 .Fn EC_GROUP_new ,
 using the implementation provided by
-.Fa meth
-(see
-.Xr EC_GFp_simple_method 3 ) .
+.Fa meth .
 It is then necessary to call
 .Fn EC_GROUP_set_curve
 to set the curve parameters.
@@ -320,7 +318,6 @@ return 1 on success or 0 on error.
 .Sh SEE ALSO
 .Xr crypto 3 ,
 .Xr d2i_ECPKParameters 3 ,
-.Xr EC_GFp_simple_method 3 ,
 .Xr EC_GROUP_copy 3 ,
 .Xr EC_KEY_new 3 ,
 .Xr EC_POINT_add 3 ,
diff --git a/src/lib/libcrypto/man/EC_KEY_new.3 b/src/lib/libcrypto/man/EC_KEY_new.3
index 500db339ac..c24cb080ef 100644
--- a/src/lib/libcrypto/man/EC_KEY_new.3
+++ b/src/lib/libcrypto/man/EC_KEY_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EC_KEY_new.3,v 1.20 2024/07/14 05:53:09 jsg Exp $
+.\" $OpenBSD: EC_KEY_new.3,v 1.21 2025/03/08 16:38:13 tb Exp $
 .\" full merge up to: OpenSSL 3aef36ff Jan 5 13:06:03 2016 -0500
 .\" partial merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 14 2024 $
+.Dd $Mdocdate: March 8 2025 $
 .Dt EC_KEY_NEW 3
 .Os
 .Sh NAME
@@ -488,7 +488,6 @@ returns the point_conversion_form for the
 .Vt EC_KEY .
 .Sh SEE ALSO
 .Xr d2i_ECPKParameters 3 ,
-.Xr EC_GFp_simple_method 3 ,
 .Xr EC_GROUP_copy 3 ,
 .Xr EC_GROUP_new 3 ,
 .Xr EC_KEY_METHOD_new 3 ,
diff --git a/src/lib/libcrypto/man/EC_POINT_add.3 b/src/lib/libcrypto/man/EC_POINT_add.3
index 6c19f6d270..c9f0a61226 100644
--- a/src/lib/libcrypto/man/EC_POINT_add.3
+++ b/src/lib/libcrypto/man/EC_POINT_add.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: EC_POINT_add.3,v 1.12 2023/04/12 09:55:22 jsg Exp $
+.\"     $OpenBSD: EC_POINT_add.3,v 1.13 2025/03/08 16:38:13 tb Exp $
 .\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Matt Caswell <matt@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 12 2023 $
+.Dd $Mdocdate: March 8 2025 $
 .Dt EC_POINT_ADD 3
 .Os
 .Sh NAME
@@ -283,7 +283,6 @@ returns 1 if the points are not equal, 0 if they are, or -1 on error.
 returns 1 if a precomputation has been done or 0 if not.
 .Sh SEE ALSO
 .Xr d2i_ECPKParameters 3 ,
-.Xr EC_GFp_simple_method 3 ,
 .Xr EC_GROUP_copy 3 ,
 .Xr EC_GROUP_new 3 ,
 .Xr EC_KEY_new 3 ,
diff --git a/src/lib/libcrypto/man/EC_POINT_new.3 b/src/lib/libcrypto/man/EC_POINT_new.3
index decfd3383d..a203dabf5d 100644
--- a/src/lib/libcrypto/man/EC_POINT_new.3
+++ b/src/lib/libcrypto/man/EC_POINT_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EC_POINT_new.3,v 1.14 2023/04/27 09:39:52 tb Exp $
+.\" $OpenBSD: EC_POINT_new.3,v 1.15 2025/03/08 16:38:13 tb Exp $
 .\" full merge up to: OpenSSL 50db8163 Jul 30 16:56:41 2018 +0100
 .\"
 .\" This file was written by Matt Caswell <matt@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 27 2023 $
+.Dd $Mdocdate: March 8 2025 $
 .Dt EC_POINT_NEW 3
 .Os
 .Sh NAME
@@ -485,7 +485,6 @@ supplied or
 on error.
 .Sh SEE ALSO
 .Xr d2i_ECPKParameters 3 ,
-.Xr EC_GFp_simple_method 3 ,
 .Xr EC_GROUP_copy 3 ,
 .Xr EC_GROUP_new 3 ,
 .Xr EC_KEY_new 3 ,
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 8df75fe284..8330fe11a3 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.305 2024/12/27 15:30:17 schwarze Exp $
+# $OpenBSD: Makefile,v 1.306 2025/03/08 16:38:13 tb Exp $
 
 .include <bsd.own.mk>
 
@@ -133,7 +133,6 @@ MAN=	\
         DSA_size.3 \
         ECDH_compute_key.3 \
         ECDSA_SIG_new.3 \
-        EC_GFp_simple_method.3 \
         EC_GROUP_copy.3 \
         EC_GROUP_new.3 \
         EC_KEY_METHOD_new.3 \