Move ECDH_OpenSSL() ECDSA_OpenSSL() to *_lib.c

Now that they no longer use static methods, they can move where they
belong. Also make the static method const, as it should have been all
along.

2 files changed, 15 insertions, 15 deletions

diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c
index 11e707dd55..477f49a6c2 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.20 2023/06/25 18:45:56 tb Exp $ */
+/* $OpenBSD: ecs_lib.c,v 1.21 2023/06/25 19:04:35 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
  *
@@ -68,6 +68,19 @@
 
 static const ECDSA_METHOD *default_ECDSA_method = NULL;
 
+static const ECDSA_METHOD openssl_ecdsa_meth = {
+        .name = "OpenSSL ECDSA method",
+        .ecdsa_do_sign = ossl_ecdsa_sign_sig,
+        .ecdsa_sign_setup = ossl_ecdsa_sign_setup,
+        .ecdsa_do_verify = ossl_ecdsa_verify_sig,
+};
+
+const ECDSA_METHOD *
+ECDSA_OpenSSL(void)
+{
+        return &openssl_ecdsa_meth;
+}
+
 void
 ECDSA_set_default_method(const ECDSA_METHOD *meth)
 {
diff --git a/src/lib/libcrypto/ecdsa/ecs_ossl.c b/src/lib/libcrypto/ecdsa/ecs_ossl.c
index 5df87f224b..547d3b59e1 100644
--- a/src/lib/libcrypto/ecdsa/ecs_ossl.c
+++ b/src/lib/libcrypto/ecdsa/ecs_ossl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs_ossl.c,v 1.35 2023/06/25 18:41:36 tb Exp $ */
+/* $OpenBSD: ecs_ossl.c,v 1.36 2023/06/25 19:04:35 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -72,19 +72,6 @@
 static int ecdsa_prepare_digest(const unsigned char *dgst, int dgst_len,
     BIGNUM *order, BIGNUM *ret);
 
-static ECDSA_METHOD openssl_ecdsa_meth = {
-        .name = "OpenSSL ECDSA method",
-        .ecdsa_do_sign = ossl_ecdsa_sign_sig,
-        .ecdsa_sign_setup = ossl_ecdsa_sign_setup,
-        .ecdsa_do_verify = ossl_ecdsa_verify_sig,
-};
-
-const ECDSA_METHOD *
-ECDSA_OpenSSL(void)
-{
-        return &openssl_ecdsa_meth;
-}
-
 static int
 ecdsa_prepare_digest(const unsigned char *dgst, int dgst_len, BIGNUM *order,
     BIGNUM *ret)