From 4f19586576da87be433f16dc44538c814b842b85 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Tue, 29 Aug 2023 10:07:42 +0000
Subject: Replace last ecdh.h and ecdsa.h occurrences with ec.h

Except if backward compatibility with older LibreSSL and OpenSSL versions
is explicitly needed, ecdsa.h and ecdh.h should no longer be used. They
are now trivial wrappers of ec.h.
---
 src/lib/libcrypto/man/ECDH_compute_key.3  |  6 +++---
 src/lib/libcrypto/man/ECDSA_SIG_new.3     |  6 +++---
 src/lib/libcrypto/man/EC_KEY_METHOD_new.3 |  6 ++----
 src/lib/libcrypto/man/EC_KEY_new.3        | 10 ++++------
 4 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/man/ECDH_compute_key.3 b/src/lib/libcrypto/man/ECDH_compute_key.3
index ba67098cd0..c49988e141 100644
--- a/src/lib/libcrypto/man/ECDH_compute_key.3
+++ b/src/lib/libcrypto/man/ECDH_compute_key.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ECDH_compute_key.3,v 1.2 2021/03/12 05:18:00 jsg Exp $
+.\" $OpenBSD: ECDH_compute_key.3,v 1.3 2023/08/29 10:07:42 tb Exp $
 .\" Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,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: March 12 2021 $
+.Dd $Mdocdate: August 29 2023 $
 .Dt ECDH_COMPUTE_KEY 3
 .Os
 .Sh NAME
@@ -21,7 +21,7 @@
 .Nm ECDH_size
 .Nd Elliptic Curve Diffie-Hellman key exchange
 .Sh SYNOPSIS
-.In openssl/ecdh.h
+.In openssl/ec.h
 .Ft int
 .Fo ECDH_compute_key
 .Fa "void *out"
diff --git a/src/lib/libcrypto/man/ECDSA_SIG_new.3 b/src/lib/libcrypto/man/ECDSA_SIG_new.3
index f86520591b..c9ef8e8143 100644
--- a/src/lib/libcrypto/man/ECDSA_SIG_new.3
+++ b/src/lib/libcrypto/man/ECDSA_SIG_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ECDSA_SIG_new.3,v 1.19 2023/07/21 04:44:40 tb Exp $
+.\" $OpenBSD: ECDSA_SIG_new.3,v 1.20 2023/08/29 10:07:42 tb Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\" selective merge up to: OpenSSL da4ea0cf Aug 5 16:13:24 2019 +0100
 .\"
@@ -50,7 +50,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 21 2023 $
+.Dd $Mdocdate: August 29 2023 $
 .Dt ECDSA_SIG_NEW 3
 .Os
 .Sh NAME
@@ -69,7 +69,7 @@
 .Nm ECDSA_do_verify
 .Nd Elliptic Curve Digital Signature Algorithm
 .Sh SYNOPSIS
-.In openssl/ecdsa.h
+.In openssl/ec.h
 .Ft ECDSA_SIG*
 .Fo ECDSA_SIG_new
 .Fa void
diff --git a/src/lib/libcrypto/man/EC_KEY_METHOD_new.3 b/src/lib/libcrypto/man/EC_KEY_METHOD_new.3
index c8efa8c732..489bd3ac66 100644
--- a/src/lib/libcrypto/man/EC_KEY_METHOD_new.3
+++ b/src/lib/libcrypto/man/EC_KEY_METHOD_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EC_KEY_METHOD_new.3,v 1.2 2023/07/20 09:28:30 tb Exp $
+.\" $OpenBSD: EC_KEY_METHOD_new.3,v 1.3 2023/08/29 10:07:42 tb Exp $
 .\" Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,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: July 20 2023 $
+.Dd $Mdocdate: August 29 2023 $
 .Dt EC_KEY_METHOD_NEW 3
 .Os
 .Sh NAME
@@ -66,7 +66,6 @@
 .Fa "int (**pset_private)(EC_KEY *key, const BIGNUM *priv_key)"
 .Fa "int (**pset_public)(EC_KEY *key, const EC_POINT *pub_key)"
 .Fc
-.In openssl/ecdsa.h
 .Ft void
 .Fo EC_KEY_METHOD_set_sign
 .Fa "EC_KEY_METHOD *meth"
@@ -105,7 +104,6 @@
 .Fa "int (**pverify_sig)(const unsigned char *dgst, int dgst_len,\
  const ECDSA_SIG *sig, EC_KEY *eckey)"
 .Fc
-.In openssl/ec.h
 .Ft void
 .Fo EC_KEY_METHOD_set_keygen
 .Fa "EC_KEY_METHOD *meth"
diff --git a/src/lib/libcrypto/man/EC_KEY_new.3 b/src/lib/libcrypto/man/EC_KEY_new.3
index 15918898da..06afdd537c 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.17 2023/04/27 09:49:44 tb Exp $
+.\" $OpenBSD: EC_KEY_new.3,v 1.18 2023/08/29 10:07:42 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: April 27 2023 $
+.Dd $Mdocdate: August 29 2023 $
 .Dt EC_KEY_NEW 3
 .Os
 .Sh NAME
@@ -387,10 +387,8 @@ The currently defined standard flags are
 .Dv EC_FLAG_NON_FIPS_ALLOW
 and
 .Dv EC_FLAG_FIPS_CHECKED .
-In addition there is the flag
-.Dv EC_FLAG_COFACTOR_ECDH
-which is specific to ECDH and is defined in
-.In openssl/ecdh.h .
+In addition there is the ECDH-specific flag
+.Dv EC_FLAG_COFACTOR_ECDH .
 .Fn EC_KEY_get_flags
 returns the current flags that are set for this
 .Vt EC_KEY .
-- 
cgit v1.2.3-55-g6feb