diff options
Diffstat (limited to 'src/lib/libcrypto/ec/ec_key.c')
-rw-r--r-- | src/lib/libcrypto/ec/ec_key.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c index a15d06b019..e5ff189803 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.35 2023/07/05 08:39:40 tb Exp $ */ | 1 | /* $OpenBSD: ec_key.c,v 1.36 2023/07/07 13:54:45 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -78,6 +78,7 @@ EC_KEY_new(void) | |||
78 | { | 78 | { |
79 | return EC_KEY_new_method(NULL); | 79 | return EC_KEY_new_method(NULL); |
80 | } | 80 | } |
81 | LCRYPTO_ALIAS(EC_KEY_new); | ||
81 | 82 | ||
82 | EC_KEY * | 83 | EC_KEY * |
83 | EC_KEY_new_by_curve_name(int nid) | 84 | EC_KEY_new_by_curve_name(int nid) |
@@ -97,6 +98,7 @@ EC_KEY_new_by_curve_name(int nid) | |||
97 | } | 98 | } |
98 | return ret; | 99 | return ret; |
99 | } | 100 | } |
101 | LCRYPTO_ALIAS(EC_KEY_new_by_curve_name); | ||
100 | 102 | ||
101 | void | 103 | void |
102 | EC_KEY_free(EC_KEY *r) | 104 | EC_KEY_free(EC_KEY *r) |
@@ -124,6 +126,7 @@ EC_KEY_free(EC_KEY *r) | |||
124 | 126 | ||
125 | freezero(r, sizeof(EC_KEY)); | 127 | freezero(r, sizeof(EC_KEY)); |
126 | } | 128 | } |
129 | LCRYPTO_ALIAS(EC_KEY_free); | ||
127 | 130 | ||
128 | EC_KEY * | 131 | EC_KEY * |
129 | EC_KEY_copy(EC_KEY *dest, const EC_KEY *src) | 132 | EC_KEY_copy(EC_KEY *dest, const EC_KEY *src) |
@@ -197,6 +200,7 @@ EC_KEY_copy(EC_KEY *dest, const EC_KEY *src) | |||
197 | 200 | ||
198 | return dest; | 201 | return dest; |
199 | } | 202 | } |
203 | LCRYPTO_ALIAS(EC_KEY_copy); | ||
200 | 204 | ||
201 | EC_KEY * | 205 | EC_KEY * |
202 | EC_KEY_dup(const EC_KEY *ec_key) | 206 | EC_KEY_dup(const EC_KEY *ec_key) |
@@ -211,6 +215,7 @@ EC_KEY_dup(const EC_KEY *ec_key) | |||
211 | } | 215 | } |
212 | return ret; | 216 | return ret; |
213 | } | 217 | } |
218 | LCRYPTO_ALIAS(EC_KEY_dup); | ||
214 | 219 | ||
215 | int | 220 | int |
216 | EC_KEY_up_ref(EC_KEY *r) | 221 | EC_KEY_up_ref(EC_KEY *r) |
@@ -218,18 +223,21 @@ EC_KEY_up_ref(EC_KEY *r) | |||
218 | int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_EC); | 223 | int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_EC); |
219 | return ((i > 1) ? 1 : 0); | 224 | return ((i > 1) ? 1 : 0); |
220 | } | 225 | } |
226 | LCRYPTO_ALIAS(EC_KEY_up_ref); | ||
221 | 227 | ||
222 | int | 228 | int |
223 | EC_KEY_set_ex_data(EC_KEY *r, int idx, void *arg) | 229 | EC_KEY_set_ex_data(EC_KEY *r, int idx, void *arg) |
224 | { | 230 | { |
225 | return CRYPTO_set_ex_data(&r->ex_data, idx, arg); | 231 | return CRYPTO_set_ex_data(&r->ex_data, idx, arg); |
226 | } | 232 | } |
233 | LCRYPTO_ALIAS(EC_KEY_set_ex_data); | ||
227 | 234 | ||
228 | void * | 235 | void * |
229 | EC_KEY_get_ex_data(const EC_KEY *r, int idx) | 236 | EC_KEY_get_ex_data(const EC_KEY *r, int idx) |
230 | { | 237 | { |
231 | return CRYPTO_get_ex_data(&r->ex_data, idx); | 238 | return CRYPTO_get_ex_data(&r->ex_data, idx); |
232 | } | 239 | } |
240 | LCRYPTO_ALIAS(EC_KEY_get_ex_data); | ||
233 | 241 | ||
234 | int | 242 | int |
235 | EC_KEY_generate_key(EC_KEY *eckey) | 243 | EC_KEY_generate_key(EC_KEY *eckey) |
@@ -239,6 +247,7 @@ EC_KEY_generate_key(EC_KEY *eckey) | |||
239 | ECerror(EC_R_NOT_IMPLEMENTED); | 247 | ECerror(EC_R_NOT_IMPLEMENTED); |
240 | return 0; | 248 | return 0; |
241 | } | 249 | } |
250 | LCRYPTO_ALIAS(EC_KEY_generate_key); | ||
242 | 251 | ||
243 | int | 252 | int |
244 | ec_key_gen(EC_KEY *eckey) | 253 | ec_key_gen(EC_KEY *eckey) |
@@ -355,6 +364,7 @@ EC_KEY_check_key(const EC_KEY *eckey) | |||
355 | 364 | ||
356 | return ret; | 365 | return ret; |
357 | } | 366 | } |
367 | LCRYPTO_ALIAS(EC_KEY_check_key); | ||
358 | 368 | ||
359 | int | 369 | int |
360 | EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x, BIGNUM *y) | 370 | EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x, BIGNUM *y) |
@@ -409,12 +419,14 @@ EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x, BIGNUM *y) | |||
409 | 419 | ||
410 | return ret; | 420 | return ret; |
411 | } | 421 | } |
422 | LCRYPTO_ALIAS(EC_KEY_set_public_key_affine_coordinates); | ||
412 | 423 | ||
413 | const EC_GROUP * | 424 | const EC_GROUP * |
414 | EC_KEY_get0_group(const EC_KEY *key) | 425 | EC_KEY_get0_group(const EC_KEY *key) |
415 | { | 426 | { |
416 | return key->group; | 427 | return key->group; |
417 | } | 428 | } |
429 | LCRYPTO_ALIAS(EC_KEY_get0_group); | ||
418 | 430 | ||
419 | int | 431 | int |
420 | EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group) | 432 | EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group) |
@@ -426,12 +438,14 @@ EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group) | |||
426 | key->group = EC_GROUP_dup(group); | 438 | key->group = EC_GROUP_dup(group); |
427 | return (key->group == NULL) ? 0 : 1; | 439 | return (key->group == NULL) ? 0 : 1; |
428 | } | 440 | } |
441 | LCRYPTO_ALIAS(EC_KEY_set_group); | ||
429 | 442 | ||
430 | const BIGNUM * | 443 | const BIGNUM * |
431 | EC_KEY_get0_private_key(const EC_KEY *key) | 444 | EC_KEY_get0_private_key(const EC_KEY *key) |
432 | { | 445 | { |
433 | return key->priv_key; | 446 | return key->priv_key; |
434 | } | 447 | } |
448 | LCRYPTO_ALIAS(EC_KEY_get0_private_key); | ||
435 | 449 | ||
436 | int | 450 | int |
437 | EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *priv_key) | 451 | EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *priv_key) |
@@ -446,12 +460,14 @@ EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *priv_key) | |||
446 | 460 | ||
447 | return 1; | 461 | return 1; |
448 | } | 462 | } |
463 | LCRYPTO_ALIAS(EC_KEY_set_private_key); | ||
449 | 464 | ||
450 | const EC_POINT * | 465 | const EC_POINT * |
451 | EC_KEY_get0_public_key(const EC_KEY *key) | 466 | EC_KEY_get0_public_key(const EC_KEY *key) |
452 | { | 467 | { |
453 | return key->pub_key; | 468 | return key->pub_key; |
454 | } | 469 | } |
470 | LCRYPTO_ALIAS(EC_KEY_get0_public_key); | ||
455 | 471 | ||
456 | int | 472 | int |
457 | EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub_key) | 473 | EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub_key) |
@@ -466,24 +482,28 @@ EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub_key) | |||
466 | 482 | ||
467 | return 1; | 483 | return 1; |
468 | } | 484 | } |
485 | LCRYPTO_ALIAS(EC_KEY_set_public_key); | ||
469 | 486 | ||
470 | unsigned int | 487 | unsigned int |
471 | EC_KEY_get_enc_flags(const EC_KEY *key) | 488 | EC_KEY_get_enc_flags(const EC_KEY *key) |
472 | { | 489 | { |
473 | return key->enc_flag; | 490 | return key->enc_flag; |
474 | } | 491 | } |
492 | LCRYPTO_ALIAS(EC_KEY_get_enc_flags); | ||
475 | 493 | ||
476 | void | 494 | void |
477 | EC_KEY_set_enc_flags(EC_KEY *key, unsigned int flags) | 495 | EC_KEY_set_enc_flags(EC_KEY *key, unsigned int flags) |
478 | { | 496 | { |
479 | key->enc_flag = flags; | 497 | key->enc_flag = flags; |
480 | } | 498 | } |
499 | LCRYPTO_ALIAS(EC_KEY_set_enc_flags); | ||
481 | 500 | ||
482 | point_conversion_form_t | 501 | point_conversion_form_t |
483 | EC_KEY_get_conv_form(const EC_KEY *key) | 502 | EC_KEY_get_conv_form(const EC_KEY *key) |
484 | { | 503 | { |
485 | return key->conv_form; | 504 | return key->conv_form; |
486 | } | 505 | } |
506 | LCRYPTO_ALIAS(EC_KEY_get_conv_form); | ||
487 | 507 | ||
488 | void | 508 | void |
489 | EC_KEY_set_conv_form(EC_KEY *key, point_conversion_form_t cform) | 509 | EC_KEY_set_conv_form(EC_KEY *key, point_conversion_form_t cform) |
@@ -492,6 +512,7 @@ EC_KEY_set_conv_form(EC_KEY *key, point_conversion_form_t cform) | |||
492 | if (key->group != NULL) | 512 | if (key->group != NULL) |
493 | EC_GROUP_set_point_conversion_form(key->group, cform); | 513 | EC_GROUP_set_point_conversion_form(key->group, cform); |
494 | } | 514 | } |
515 | LCRYPTO_ALIAS(EC_KEY_set_conv_form); | ||
495 | 516 | ||
496 | void | 517 | void |
497 | EC_KEY_set_asn1_flag(EC_KEY *key, int flag) | 518 | EC_KEY_set_asn1_flag(EC_KEY *key, int flag) |
@@ -499,6 +520,7 @@ EC_KEY_set_asn1_flag(EC_KEY *key, int flag) | |||
499 | if (key->group != NULL) | 520 | if (key->group != NULL) |
500 | EC_GROUP_set_asn1_flag(key->group, flag); | 521 | EC_GROUP_set_asn1_flag(key->group, flag); |
501 | } | 522 | } |
523 | LCRYPTO_ALIAS(EC_KEY_set_asn1_flag); | ||
502 | 524 | ||
503 | int | 525 | int |
504 | EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx) | 526 | EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx) |
@@ -507,21 +529,25 @@ EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx) | |||
507 | return 0; | 529 | return 0; |
508 | return EC_GROUP_precompute_mult(key->group, ctx); | 530 | return EC_GROUP_precompute_mult(key->group, ctx); |
509 | } | 531 | } |
532 | LCRYPTO_ALIAS(EC_KEY_precompute_mult); | ||
510 | 533 | ||
511 | int | 534 | int |
512 | EC_KEY_get_flags(const EC_KEY *key) | 535 | EC_KEY_get_flags(const EC_KEY *key) |
513 | { | 536 | { |
514 | return key->flags; | 537 | return key->flags; |
515 | } | 538 | } |
539 | LCRYPTO_ALIAS(EC_KEY_get_flags); | ||
516 | 540 | ||
517 | void | 541 | void |
518 | EC_KEY_set_flags(EC_KEY *key, int flags) | 542 | EC_KEY_set_flags(EC_KEY *key, int flags) |
519 | { | 543 | { |
520 | key->flags |= flags; | 544 | key->flags |= flags; |
521 | } | 545 | } |
546 | LCRYPTO_ALIAS(EC_KEY_set_flags); | ||
522 | 547 | ||
523 | void | 548 | void |
524 | EC_KEY_clear_flags(EC_KEY *key, int flags) | 549 | EC_KEY_clear_flags(EC_KEY *key, int flags) |
525 | { | 550 | { |
526 | key->flags &= ~flags; | 551 | key->flags &= ~flags; |
527 | } | 552 | } |
553 | LCRYPTO_ALIAS(EC_KEY_clear_flags); | ||