From ef4ac7f08f60f4cf212a5d0b9144b09a4be3a085 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sun, 25 Jun 2023 18:24:33 +0000
Subject: Make {ECDH,ECDSA}_set_method() always fail

They will be removed in the next major bump. No port uses them. They use
code that is in the way of upcoming surgery. Only libtls used the ECDSA
version, but thankfully op cleaned that up.

ok jsing
---
 src/lib/libcrypto/ecdh/ech_lib.c  | 16 ++--------------
 src/lib/libcrypto/ecdsa/ecs_lib.c | 17 ++---------------
 2 files changed, 4 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c
index 15d7737c39..90e14e1108 100644
--- a/src/lib/libcrypto/ecdh/ech_lib.c
+++ b/src/lib/libcrypto/ecdh/ech_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ech_lib.c,v 1.16 2023/04/25 19:26:45 tb Exp $ */
+/* $OpenBSD: ech_lib.c,v 1.17 2023/06/25 18:24:33 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -103,19 +103,7 @@ ECDH_get_default_method(void)
 int
 ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth)
 {
-	ECDH_DATA *ecdh;
-
-	ecdh = ecdh_check(eckey);
-
-	if (ecdh == NULL)
-		return 0;
-
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE_finish(ecdh->engine);
-	ecdh->engine = NULL;
-#endif
-	ecdh->meth = meth;
-	return 1;
+	return 0;
 }
 
 static ECDH_DATA *
diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c
index 9a35a030db..caebeeb1f9 100644
--- a/src/lib/libcrypto/ecdsa/ecs_lib.c
+++ b/src/lib/libcrypto/ecdsa/ecs_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs_lib.c,v 1.17 2023/04/25 19:26:45 tb Exp $ */
+/* $OpenBSD: ecs_lib.c,v 1.18 2023/06/25 18:24:33 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
  *
@@ -90,20 +90,7 @@ ECDSA_get_default_method(void)
 int
 ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth)
 {
-	ECDSA_DATA *ecdsa;
-
-	ecdsa = ecdsa_check(eckey);
-
-	if (ecdsa == NULL)
-		return 0;
-
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE_finish(ecdsa->engine);
-	ecdsa->engine = NULL;
-#endif
-	ecdsa->meth = meth;
-
-	return 1;
+	return 0;
 }
 
 static ECDSA_DATA *
-- 
cgit v1.2.3-55-g6feb