diff options
author | tb <> | 2025-01-11 20:55:08 +0000 |
---|---|---|
committer | tb <> | 2025-01-11 20:55:08 +0000 |
commit | 3a15195f5d443757ac8eb30c0ef2229a374797e7 (patch) | |
tree | 445c97572ee8c54ad667d4cf90f23f2c1ea35bde | |
parent | 08554dfc99dfef7b2f4fefeadc3c93d11486bca8 (diff) | |
download | openbsd-3a15195f5d443757ac8eb30c0ef2229a374797e7.tar.gz openbsd-3a15195f5d443757ac8eb30c0ef2229a374797e7.tar.bz2 openbsd-3a15195f5d443757ac8eb30c0ef2229a374797e7.zip |
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.
-rw-r--r-- | src/lib/libcrypto/ec/ec_key.c | 4 | ||||
-rw-r--r-- | 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 @@ | |||
1 | /* $OpenBSD: ec_key.c,v 1.48 2024/11/16 10:38:10 tb Exp $ */ | 1 | /* $OpenBSD: ec_key.c,v 1.49 2025/01/11 20:55:08 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -592,6 +592,8 @@ EC_KEY_new_method(ENGINE *engine) | |||
592 | } | 592 | } |
593 | LCRYPTO_ALIAS(EC_KEY_new_method); | 593 | LCRYPTO_ALIAS(EC_KEY_new_method); |
594 | 594 | ||
595 | #define EC_KEY_METHOD_DYNAMIC 1 | ||
596 | |||
595 | EC_KEY_METHOD * | 597 | EC_KEY_METHOD * |
596 | EC_KEY_METHOD_new(const EC_KEY_METHOD *meth) | 598 | EC_KEY_METHOD_new(const EC_KEY_METHOD *meth) |
597 | { | 599 | { |
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 @@ | |||
1 | /* $OpenBSD: ec_local.h,v 1.60 2025/01/11 15:32:36 tb Exp $ */ | 1 | /* $OpenBSD: ec_local.h,v 1.61 2025/01/11 20:55:08 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Originally written by Bodo Moeller for the OpenSSL project. | 3 | * Originally written by Bodo Moeller for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -219,8 +219,6 @@ struct ec_key_method_st { | |||
219 | const ECDSA_SIG *sig, EC_KEY *eckey); | 219 | const ECDSA_SIG *sig, EC_KEY *eckey); |
220 | } /* EC_KEY_METHOD */; | 220 | } /* EC_KEY_METHOD */; |
221 | 221 | ||
222 | #define EC_KEY_METHOD_DYNAMIC 1 | ||
223 | |||
224 | struct ec_key_st { | 222 | struct ec_key_st { |
225 | const EC_KEY_METHOD *meth; | 223 | const EC_KEY_METHOD *meth; |
226 | 224 | ||