diff options
Diffstat (limited to 'src/lib/libcrypto')
| -rw-r--r-- | src/lib/libcrypto/ec/ec_ameth.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c index 258daec127..324865870c 100644 --- a/src/lib/libcrypto/ec/ec_ameth.c +++ b/src/lib/libcrypto/ec/ec_ameth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ec_ameth.c,v 1.44 2023/09/24 07:58:31 tb Exp $ */ | 1 | /* $OpenBSD: ec_ameth.c,v 1.45 2023/09/24 08:08:54 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -288,9 +288,10 @@ eckey_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey) | |||
| 288 | static int | 288 | static int |
| 289 | eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) | 289 | eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) |
| 290 | { | 290 | { |
| 291 | int r; | ||
| 292 | const EC_GROUP *group = EC_KEY_get0_group(b->pkey.ec); | 291 | const EC_GROUP *group = EC_KEY_get0_group(b->pkey.ec); |
| 293 | const EC_POINT *pa = EC_KEY_get0_public_key(a->pkey.ec), *pb = EC_KEY_get0_public_key(b->pkey.ec); | 292 | const EC_POINT *pa = EC_KEY_get0_public_key(a->pkey.ec); |
| 293 | const EC_POINT *pb = EC_KEY_get0_public_key(b->pkey.ec); | ||
| 294 | int r; | ||
| 294 | 295 | ||
| 295 | r = EC_POINT_cmp(group, pa, pb, NULL); | 296 | r = EC_POINT_cmp(group, pa, pb, NULL); |
| 296 | if (r == 0) | 297 | if (r == 0) |
| @@ -464,7 +465,9 @@ ec_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) | |||
| 464 | static int | 465 | static int |
| 465 | ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) | 466 | ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) |
| 466 | { | 467 | { |
| 467 | const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec), *group_b = EC_KEY_get0_group(b->pkey.ec); | 468 | const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec); |
| 469 | const EC_GROUP *group_b = EC_KEY_get0_group(b->pkey.ec); | ||
| 470 | |||
| 468 | if (EC_GROUP_cmp(group_a, group_b, NULL)) | 471 | if (EC_GROUP_cmp(group_a, group_b, NULL)) |
| 469 | return 0; | 472 | return 0; |
| 470 | else | 473 | else |
