diff options
author | tb <> | 2024-11-16 10:30:48 +0000 |
---|---|---|
committer | tb <> | 2024-11-16 10:30:48 +0000 |
commit | d13b8f23a4c997c71d1410c6fb627fc73a8bccd1 (patch) | |
tree | 0b09f2d6f4875f2c9156ade3c3a1fd07a9f3081c /src/lib | |
parent | 6a22cb2662a65fcc708c1076799aebd0596f3747 (diff) | |
download | openbsd-d13b8f23a4c997c71d1410c6fb627fc73a8bccd1.tar.gz openbsd-d13b8f23a4c997c71d1410c6fb627fc73a8bccd1.tar.bz2 openbsd-d13b8f23a4c997c71d1410c6fb627fc73a8bccd1.zip |
Move the default EC_KEY_METHOD to the end of the file
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/ec/ec_kmeth.c | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/src/lib/libcrypto/ec/ec_kmeth.c b/src/lib/libcrypto/ec/ec_kmeth.c index fa79b9a29f..6795af8bbf 100644 --- a/src/lib/libcrypto/ec/ec_kmeth.c +++ b/src/lib/libcrypto/ec/ec_kmeth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_kmeth.c,v 1.14 2024/08/03 13:06:37 tb Exp $ */ | 1 | /* $OpenBSD: ec_kmeth.c,v 1.15 2024/11/16 10:30:48 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
4 | * project. | 4 | * project. |
@@ -59,55 +59,6 @@ | |||
59 | #include "ec_local.h" | 59 | #include "ec_local.h" |
60 | #include "ecdsa_local.h" | 60 | #include "ecdsa_local.h" |
61 | 61 | ||
62 | static const EC_KEY_METHOD openssl_ec_key_method = { | ||
63 | .name = "OpenSSL EC_KEY method", | ||
64 | .flags = 0, | ||
65 | |||
66 | .init = NULL, | ||
67 | .finish = NULL, | ||
68 | .copy = NULL, | ||
69 | |||
70 | .set_group = NULL, | ||
71 | .set_private = NULL, | ||
72 | .set_public = NULL, | ||
73 | |||
74 | .keygen = ec_key_gen, | ||
75 | .compute_key = ecdh_compute_key, | ||
76 | |||
77 | .sign = ecdsa_sign, | ||
78 | .sign_setup = ecdsa_sign_setup, | ||
79 | .sign_sig = ecdsa_sign_sig, | ||
80 | |||
81 | .verify = ecdsa_verify, | ||
82 | .verify_sig = ecdsa_verify_sig, | ||
83 | }; | ||
84 | |||
85 | const EC_KEY_METHOD *default_ec_key_meth = &openssl_ec_key_method; | ||
86 | |||
87 | const EC_KEY_METHOD * | ||
88 | EC_KEY_OpenSSL(void) | ||
89 | { | ||
90 | return &openssl_ec_key_method; | ||
91 | } | ||
92 | LCRYPTO_ALIAS(EC_KEY_OpenSSL); | ||
93 | |||
94 | const EC_KEY_METHOD * | ||
95 | EC_KEY_get_default_method(void) | ||
96 | { | ||
97 | return default_ec_key_meth; | ||
98 | } | ||
99 | LCRYPTO_ALIAS(EC_KEY_get_default_method); | ||
100 | |||
101 | void | ||
102 | EC_KEY_set_default_method(const EC_KEY_METHOD *meth) | ||
103 | { | ||
104 | if (meth == NULL) | ||
105 | default_ec_key_meth = &openssl_ec_key_method; | ||
106 | else | ||
107 | default_ec_key_meth = meth; | ||
108 | } | ||
109 | LCRYPTO_ALIAS(EC_KEY_set_default_method); | ||
110 | |||
111 | const EC_KEY_METHOD * | 62 | const EC_KEY_METHOD * |
112 | EC_KEY_get_method(const EC_KEY *key) | 63 | EC_KEY_get_method(const EC_KEY *key) |
113 | { | 64 | { |
@@ -326,3 +277,52 @@ EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth, | |||
326 | *pverify_sig = meth->verify_sig; | 277 | *pverify_sig = meth->verify_sig; |
327 | } | 278 | } |
328 | LCRYPTO_ALIAS(EC_KEY_METHOD_get_verify); | 279 | LCRYPTO_ALIAS(EC_KEY_METHOD_get_verify); |
280 | |||
281 | static const EC_KEY_METHOD openssl_ec_key_method = { | ||
282 | .name = "OpenSSL EC_KEY method", | ||
283 | .flags = 0, | ||
284 | |||
285 | .init = NULL, | ||
286 | .finish = NULL, | ||
287 | .copy = NULL, | ||
288 | |||
289 | .set_group = NULL, | ||
290 | .set_private = NULL, | ||
291 | .set_public = NULL, | ||
292 | |||
293 | .keygen = ec_key_gen, | ||
294 | .compute_key = ecdh_compute_key, | ||
295 | |||
296 | .sign = ecdsa_sign, | ||
297 | .sign_setup = ecdsa_sign_setup, | ||
298 | .sign_sig = ecdsa_sign_sig, | ||
299 | |||
300 | .verify = ecdsa_verify, | ||
301 | .verify_sig = ecdsa_verify_sig, | ||
302 | }; | ||
303 | |||
304 | const EC_KEY_METHOD *default_ec_key_meth = &openssl_ec_key_method; | ||
305 | |||
306 | const EC_KEY_METHOD * | ||
307 | EC_KEY_OpenSSL(void) | ||
308 | { | ||
309 | return &openssl_ec_key_method; | ||
310 | } | ||
311 | LCRYPTO_ALIAS(EC_KEY_OpenSSL); | ||
312 | |||
313 | const EC_KEY_METHOD * | ||
314 | EC_KEY_get_default_method(void) | ||
315 | { | ||
316 | return default_ec_key_meth; | ||
317 | } | ||
318 | LCRYPTO_ALIAS(EC_KEY_get_default_method); | ||
319 | |||
320 | void | ||
321 | EC_KEY_set_default_method(const EC_KEY_METHOD *meth) | ||
322 | { | ||
323 | if (meth == NULL) | ||
324 | default_ec_key_meth = &openssl_ec_key_method; | ||
325 | else | ||
326 | default_ec_key_meth = meth; | ||
327 | } | ||
328 | LCRYPTO_ALIAS(EC_KEY_set_default_method); | ||