diff options
| author | tb <> | 2021-11-30 18:17:03 +0000 |
|---|---|---|
| committer | tb <> | 2021-11-30 18:17:03 +0000 |
| commit | 4f56e5859ceef7b0a2a1a03efbe40958cb60302e (patch) | |
| tree | 6df715533854007efe3eaef01c3c369ffb6359c8 | |
| parent | 1124df373f1018b4c5a215c4394e6a2815a4bb20 (diff) | |
| download | openbsd-4f56e5859ceef7b0a2a1a03efbe40958cb60302e.tar.gz openbsd-4f56e5859ceef7b0a2a1a03efbe40958cb60302e.tar.bz2 openbsd-4f56e5859ceef7b0a2a1a03efbe40958cb60302e.zip | |
Align ssl_kex_derive_ecdhe_ecp() with ssl_kex_derive_dhe()
sk is commonly used for a STACK_OF(), so call the shared key simply key.
ok jsing
| -rw-r--r-- | src/lib/libssl/ssl_kex.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl_kex.c b/src/lib/libssl/ssl_kex.c index 61767c4006..9af440d827 100644 --- a/src/lib/libssl/ssl_kex.c +++ b/src/lib/libssl/ssl_kex.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_kex.c,v 1.4 2021/11/29 18:48:22 tb Exp $ */ | 1 | /* $OpenBSD: ssl_kex.c,v 1.5 2021/11/30 18:17:03 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -320,8 +320,8 @@ ssl_kex_derive_ecdhe_ecp(EC_KEY *ecdh, EC_KEY *ecdh_peer, | |||
| 320 | uint8_t **shared_key, size_t *shared_key_len) | 320 | uint8_t **shared_key, size_t *shared_key_len) |
| 321 | { | 321 | { |
| 322 | const EC_POINT *point; | 322 | const EC_POINT *point; |
| 323 | uint8_t *sk = NULL; | 323 | uint8_t *key = NULL; |
| 324 | int sk_len = 0; | 324 | int key_len = 0; |
| 325 | int ret = 0; | 325 | int ret = 0; |
| 326 | 326 | ||
| 327 | if (!EC_GROUP_check(EC_KEY_get0_group(ecdh), NULL)) | 327 | if (!EC_GROUP_check(EC_KEY_get0_group(ecdh), NULL)) |
| @@ -332,22 +332,22 @@ ssl_kex_derive_ecdhe_ecp(EC_KEY *ecdh, EC_KEY *ecdh_peer, | |||
| 332 | if ((point = EC_KEY_get0_public_key(ecdh_peer)) == NULL) | 332 | if ((point = EC_KEY_get0_public_key(ecdh_peer)) == NULL) |
| 333 | goto err; | 333 | goto err; |
| 334 | 334 | ||
| 335 | if ((sk_len = ECDH_size(ecdh)) <= 0) | 335 | if ((key_len = ECDH_size(ecdh)) <= 0) |
| 336 | goto err; | 336 | goto err; |
| 337 | if ((sk = calloc(1, sk_len)) == NULL) | 337 | if ((key = calloc(1, key_len)) == NULL) |
| 338 | goto err; | 338 | goto err; |
| 339 | 339 | ||
| 340 | if (ECDH_compute_key(sk, sk_len, point, ecdh, NULL) <= 0) | 340 | if (ECDH_compute_key(key, key_len, point, ecdh, NULL) <= 0) |
| 341 | goto err; | 341 | goto err; |
| 342 | 342 | ||
| 343 | *shared_key = sk; | 343 | *shared_key = key; |
| 344 | *shared_key_len = sk_len; | 344 | *shared_key_len = key_len; |
| 345 | sk = NULL; | 345 | key = NULL; |
| 346 | 346 | ||
| 347 | ret = 1; | 347 | ret = 1; |
| 348 | 348 | ||
| 349 | err: | 349 | err: |
| 350 | freezero(sk, sk_len); | 350 | freezero(key, key_len); |
| 351 | 351 | ||
| 352 | return ret; | 352 | return ret; |
| 353 | } | 353 | } |
