diff options
author | tb <> | 2022-11-19 07:29:29 +0000 |
---|---|---|
committer | tb <> | 2022-11-19 07:29:29 +0000 |
commit | 97ff0b8011f923270c9adb50e24c2b4c4a533238 (patch) | |
tree | 744c8fadca050ecfeaa626562148788777b42d2f /src/lib/libcrypto/ec/ec_key.c | |
parent | b197546e7fd8128aedea248a6196a0d25734b937 (diff) | |
download | openbsd-97ff0b8011f923270c9adb50e24c2b4c4a533238.tar.gz openbsd-97ff0b8011f923270c9adb50e24c2b4c4a533238.tar.bz2 openbsd-97ff0b8011f923270c9adb50e24c2b4c4a533238.zip |
Fix an annoying quirk in the EC code
Dealing with elliptic curves makes some people think that it would be kind
of neat to multiply types with variable names. Sometimes. Only in function
definitions.
Diffstat (limited to 'src/lib/libcrypto/ec/ec_key.c')
-rw-r--r-- | src/lib/libcrypto/ec/ec_key.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c index 3aa6a96eb8..fa8d463220 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.27 2022/11/19 07:00:57 tb Exp $ */ | 1 | /* $OpenBSD: ec_key.c,v 1.28 2022/11/19 07:29:29 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -99,7 +99,7 @@ EC_KEY_new_by_curve_name(int nid) | |||
99 | } | 99 | } |
100 | 100 | ||
101 | void | 101 | void |
102 | EC_KEY_free(EC_KEY * r) | 102 | EC_KEY_free(EC_KEY *r) |
103 | { | 103 | { |
104 | int i; | 104 | int i; |
105 | 105 | ||
@@ -128,7 +128,7 @@ EC_KEY_free(EC_KEY * r) | |||
128 | } | 128 | } |
129 | 129 | ||
130 | EC_KEY * | 130 | EC_KEY * |
131 | EC_KEY_copy(EC_KEY * dest, const EC_KEY * src) | 131 | EC_KEY_copy(EC_KEY *dest, const EC_KEY *src) |
132 | { | 132 | { |
133 | EC_EXTRA_DATA *d; | 133 | EC_EXTRA_DATA *d; |
134 | 134 | ||
@@ -215,7 +215,7 @@ EC_KEY_copy(EC_KEY * dest, const EC_KEY * src) | |||
215 | } | 215 | } |
216 | 216 | ||
217 | EC_KEY * | 217 | EC_KEY * |
218 | EC_KEY_dup(const EC_KEY * ec_key) | 218 | EC_KEY_dup(const EC_KEY *ec_key) |
219 | { | 219 | { |
220 | EC_KEY *ret; | 220 | EC_KEY *ret; |
221 | 221 | ||
@@ -229,7 +229,7 @@ EC_KEY_dup(const EC_KEY * ec_key) | |||
229 | } | 229 | } |
230 | 230 | ||
231 | int | 231 | int |
232 | EC_KEY_up_ref(EC_KEY * r) | 232 | EC_KEY_up_ref(EC_KEY *r) |
233 | { | 233 | { |
234 | int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_EC); | 234 | int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_EC); |
235 | return ((i > 1) ? 1 : 0); | 235 | return ((i > 1) ? 1 : 0); |
@@ -309,7 +309,7 @@ ossl_ec_key_gen(EC_KEY *eckey) | |||
309 | } | 309 | } |
310 | 310 | ||
311 | int | 311 | int |
312 | EC_KEY_check_key(const EC_KEY * eckey) | 312 | EC_KEY_check_key(const EC_KEY *eckey) |
313 | { | 313 | { |
314 | int ok = 0; | 314 | int ok = 0; |
315 | BN_CTX *ctx = NULL; | 315 | BN_CTX *ctx = NULL; |
@@ -376,7 +376,7 @@ EC_KEY_check_key(const EC_KEY * eckey) | |||
376 | } | 376 | } |
377 | 377 | ||
378 | int | 378 | int |
379 | EC_KEY_set_public_key_affine_coordinates(EC_KEY * key, BIGNUM * x, BIGNUM * y) | 379 | EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x, BIGNUM *y) |
380 | { | 380 | { |
381 | BN_CTX *ctx = NULL; | 381 | BN_CTX *ctx = NULL; |
382 | BIGNUM *tx, *ty; | 382 | BIGNUM *tx, *ty; |
@@ -429,13 +429,13 @@ EC_KEY_set_public_key_affine_coordinates(EC_KEY * key, BIGNUM * x, BIGNUM * y) | |||
429 | } | 429 | } |
430 | 430 | ||
431 | const EC_GROUP * | 431 | const EC_GROUP * |
432 | EC_KEY_get0_group(const EC_KEY * key) | 432 | EC_KEY_get0_group(const EC_KEY *key) |
433 | { | 433 | { |
434 | return key->group; | 434 | return key->group; |
435 | } | 435 | } |
436 | 436 | ||
437 | int | 437 | int |
438 | EC_KEY_set_group(EC_KEY * key, const EC_GROUP * group) | 438 | EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group) |
439 | { | 439 | { |
440 | if (key->meth->set_group != NULL && | 440 | if (key->meth->set_group != NULL && |
441 | key->meth->set_group(key, group) == 0) | 441 | key->meth->set_group(key, group) == 0) |
@@ -446,13 +446,13 @@ EC_KEY_set_group(EC_KEY * key, const EC_GROUP * group) | |||
446 | } | 446 | } |
447 | 447 | ||
448 | const BIGNUM * | 448 | const BIGNUM * |
449 | EC_KEY_get0_private_key(const EC_KEY * key) | 449 | EC_KEY_get0_private_key(const EC_KEY *key) |
450 | { | 450 | { |
451 | return key->priv_key; | 451 | return key->priv_key; |
452 | } | 452 | } |
453 | 453 | ||
454 | int | 454 | int |
455 | EC_KEY_set_private_key(EC_KEY * key, const BIGNUM * priv_key) | 455 | EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *priv_key) |
456 | { | 456 | { |
457 | if (key->meth->set_private != NULL && | 457 | if (key->meth->set_private != NULL && |
458 | key->meth->set_private(key, priv_key) == 0) | 458 | key->meth->set_private(key, priv_key) == 0) |
@@ -463,13 +463,13 @@ EC_KEY_set_private_key(EC_KEY * key, const BIGNUM * priv_key) | |||
463 | } | 463 | } |
464 | 464 | ||
465 | const EC_POINT * | 465 | const EC_POINT * |
466 | EC_KEY_get0_public_key(const EC_KEY * key) | 466 | EC_KEY_get0_public_key(const EC_KEY *key) |
467 | { | 467 | { |
468 | return key->pub_key; | 468 | return key->pub_key; |
469 | } | 469 | } |
470 | 470 | ||
471 | int | 471 | int |
472 | EC_KEY_set_public_key(EC_KEY * key, const EC_POINT * pub_key) | 472 | EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub_key) |
473 | { | 473 | { |
474 | if (key->meth->set_public != NULL && | 474 | if (key->meth->set_public != NULL && |
475 | key->meth->set_public(key, pub_key) == 0) | 475 | key->meth->set_public(key, pub_key) == 0) |
@@ -480,25 +480,25 @@ EC_KEY_set_public_key(EC_KEY * key, const EC_POINT * pub_key) | |||
480 | } | 480 | } |
481 | 481 | ||
482 | unsigned int | 482 | unsigned int |
483 | EC_KEY_get_enc_flags(const EC_KEY * key) | 483 | EC_KEY_get_enc_flags(const EC_KEY *key) |
484 | { | 484 | { |
485 | return key->enc_flag; | 485 | return key->enc_flag; |
486 | } | 486 | } |
487 | 487 | ||
488 | void | 488 | void |
489 | EC_KEY_set_enc_flags(EC_KEY * key, unsigned int flags) | 489 | EC_KEY_set_enc_flags(EC_KEY *key, unsigned int flags) |
490 | { | 490 | { |
491 | key->enc_flag = flags; | 491 | key->enc_flag = flags; |
492 | } | 492 | } |
493 | 493 | ||
494 | point_conversion_form_t | 494 | point_conversion_form_t |
495 | EC_KEY_get_conv_form(const EC_KEY * key) | 495 | EC_KEY_get_conv_form(const EC_KEY *key) |
496 | { | 496 | { |
497 | return key->conv_form; | 497 | return key->conv_form; |
498 | } | 498 | } |
499 | 499 | ||
500 | void | 500 | void |
501 | EC_KEY_set_conv_form(EC_KEY * key, point_conversion_form_t cform) | 501 | EC_KEY_set_conv_form(EC_KEY *key, point_conversion_form_t cform) |
502 | { | 502 | { |
503 | key->conv_form = cform; | 503 | key->conv_form = cform; |
504 | if (key->group != NULL) | 504 | if (key->group != NULL) |
@@ -521,7 +521,7 @@ EC_KEY_get_key_method_data(EC_KEY *key, | |||
521 | } | 521 | } |
522 | 522 | ||
523 | void * | 523 | void * |
524 | EC_KEY_insert_key_method_data(EC_KEY * key, void *data, | 524 | EC_KEY_insert_key_method_data(EC_KEY *key, void *data, |
525 | void *(*dup_func) (void *), | 525 | void *(*dup_func) (void *), |
526 | void (*free_func) (void *), | 526 | void (*free_func) (void *), |
527 | void (*clear_free_func) (void *)) | 527 | void (*clear_free_func) (void *)) |
@@ -538,14 +538,14 @@ EC_KEY_insert_key_method_data(EC_KEY * key, void *data, | |||
538 | } | 538 | } |
539 | 539 | ||
540 | void | 540 | void |
541 | EC_KEY_set_asn1_flag(EC_KEY * key, int flag) | 541 | EC_KEY_set_asn1_flag(EC_KEY *key, int flag) |
542 | { | 542 | { |
543 | if (key->group != NULL) | 543 | if (key->group != NULL) |
544 | EC_GROUP_set_asn1_flag(key->group, flag); | 544 | EC_GROUP_set_asn1_flag(key->group, flag); |
545 | } | 545 | } |
546 | 546 | ||
547 | int | 547 | int |
548 | EC_KEY_precompute_mult(EC_KEY * key, BN_CTX * ctx) | 548 | EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx) |
549 | { | 549 | { |
550 | if (key->group == NULL) | 550 | if (key->group == NULL) |
551 | return 0; | 551 | return 0; |
@@ -553,19 +553,19 @@ EC_KEY_precompute_mult(EC_KEY * key, BN_CTX * ctx) | |||
553 | } | 553 | } |
554 | 554 | ||
555 | int | 555 | int |
556 | EC_KEY_get_flags(const EC_KEY * key) | 556 | EC_KEY_get_flags(const EC_KEY *key) |
557 | { | 557 | { |
558 | return key->flags; | 558 | return key->flags; |
559 | } | 559 | } |
560 | 560 | ||
561 | void | 561 | void |
562 | EC_KEY_set_flags(EC_KEY * key, int flags) | 562 | EC_KEY_set_flags(EC_KEY *key, int flags) |
563 | { | 563 | { |
564 | key->flags |= flags; | 564 | key->flags |= flags; |
565 | } | 565 | } |
566 | 566 | ||
567 | void | 567 | void |
568 | EC_KEY_clear_flags(EC_KEY * key, int flags) | 568 | EC_KEY_clear_flags(EC_KEY *key, int flags) |
569 | { | 569 | { |
570 | key->flags &= ~flags; | 570 | key->flags &= ~flags; |
571 | } | 571 | } |