From 3a15195f5d443757ac8eb30c0ef2229a374797e7 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 11 Jan 2025 20:55:08 +0000 Subject: Move EC_KEY_METHOD_DYNAMIC next to the two methods using it Only EC_KEY_METHOD_{new,free}() need to know about this flag, so make that more obvious. --- src/lib/libcrypto/ec/ec_key.c | 4 +++- src/lib/libcrypto/ec/ec_local.h | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c index a0a8ff2084..09f89d4e57 100644 --- a/src/lib/libcrypto/ec/ec_key.c +++ b/src/lib/libcrypto/ec/ec_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_key.c,v 1.48 2024/11/16 10:38:10 tb Exp $ */ +/* $OpenBSD: ec_key.c,v 1.49 2025/01/11 20:55:08 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -592,6 +592,8 @@ EC_KEY_new_method(ENGINE *engine) } LCRYPTO_ALIAS(EC_KEY_new_method); +#define EC_KEY_METHOD_DYNAMIC 1 + EC_KEY_METHOD * EC_KEY_METHOD_new(const EC_KEY_METHOD *meth) { diff --git a/src/lib/libcrypto/ec/ec_local.h b/src/lib/libcrypto/ec/ec_local.h index 3f2837596d..363c723f66 100644 --- a/src/lib/libcrypto/ec/ec_local.h +++ b/src/lib/libcrypto/ec/ec_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_local.h,v 1.60 2025/01/11 15:32:36 tb Exp $ */ +/* $OpenBSD: ec_local.h,v 1.61 2025/01/11 20:55:08 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -219,8 +219,6 @@ struct ec_key_method_st { const ECDSA_SIG *sig, EC_KEY *eckey); } /* EC_KEY_METHOD */; -#define EC_KEY_METHOD_DYNAMIC 1 - struct ec_key_st { const EC_KEY_METHOD *meth; -- cgit v1.2.3-55-g6feb