diff options
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
| -rw-r--r-- | src/lib/libssl/t1_lib.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index beaaae1eb0..638e81ae82 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: t1_lib.c,v 1.191 2022/07/02 16:00:12 tb Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.192 2022/07/03 08:13:45 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -342,15 +342,15 @@ static const uint16_t ecgroups_server_default[] = { | |||
| 342 | int | 342 | int |
| 343 | tls1_ec_group_id2nid(uint16_t group_id, int *out_nid) | 343 | tls1_ec_group_id2nid(uint16_t group_id, int *out_nid) |
| 344 | { | 344 | { |
| 345 | const struct supported_group *group; | 345 | int nid; |
| 346 | 346 | ||
| 347 | if (group_id < 1 || group_id >= NID_LIST_LEN) | 347 | if (group_id >= NID_LIST_LEN) |
| 348 | return 0; | 348 | return 0; |
| 349 | 349 | ||
| 350 | if ((group = &nid_list[group_id]) == NULL) | 350 | if ((nid = nid_list[group_id].nid) == 0) |
| 351 | return 0; | 351 | return 0; |
| 352 | 352 | ||
| 353 | *out_nid = group->nid; | 353 | *out_nid = nid; |
| 354 | 354 | ||
| 355 | return 1; | 355 | return 1; |
| 356 | } | 356 | } |
| @@ -358,15 +358,15 @@ tls1_ec_group_id2nid(uint16_t group_id, int *out_nid) | |||
| 358 | int | 358 | int |
| 359 | tls1_ec_group_id2bits(uint16_t group_id, int *out_bits) | 359 | tls1_ec_group_id2bits(uint16_t group_id, int *out_bits) |
| 360 | { | 360 | { |
| 361 | const struct supported_group *group; | 361 | int bits; |
| 362 | 362 | ||
| 363 | if (group_id < 1 || group_id >= NID_LIST_LEN) | 363 | if (group_id >= NID_LIST_LEN) |
| 364 | return 0; | 364 | return 0; |
| 365 | 365 | ||
| 366 | if ((group = &nid_list[group_id]) == NULL) | 366 | if ((bits = nid_list[group_id].bits) == 0) |
| 367 | return 0; | 367 | return 0; |
| 368 | 368 | ||
| 369 | *out_bits = group->bits; | 369 | *out_bits = bits; |
| 370 | 370 | ||
| 371 | return 1; | 371 | return 1; |
| 372 | } | 372 | } |
