wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

wc_ecc_shared_secret_ssh fix

Browse Source 
- wc_ecc_shared_secret_ssh should either be declared or not. Having two different signatures for the same function is error prone.
- Don't use wc_ecc_shared_secret_ssh in our code. Use wc_ecc_shared_secret directly.
This commit is contained in:
Juliusz Sosinowicz
2024-02-16 13:38:35 +01:00
parent d34b254247
commit 469760e186
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/api.c
View File

@ -25052,14 +25052,15 @@ static int test_wc_ecc_pointFns(void)
/* /*
* Testing wc_ecc_sahred_secret_ssh() * Testing wc_ecc_shared_secret_ssh()
*/ */
static int test_wc_ecc_shared_secret_ssh(void) static int test_wc_ecc_shared_secret_ssh(void)
{ {
EXPECT_DECLS; EXPECT_DECLS;
#if defined(HAVE_ECC) && defined(HAVE_ECC_DHE) && \ #if defined(HAVE_ECC) && defined(HAVE_ECC_DHE) && \
!defined(WC_NO_RNG) && !defined(WOLFSSL_ATECC508A) && \ !defined(WC_NO_RNG) && !defined(WOLFSSL_ATECC508A) && \
!defined(WOLFSSL_ATECC608A) !defined(WOLFSSL_ATECC608A) && !defined(PLUTON_CRYPTO_ECC) && \
!defined(WOLFSSL_CRYPTOCELL)
ecc_key key; ecc_key key;
ecc_key key2; ecc_key key2;
WC_RNG rng; WC_RNG rng;

6
wolfcrypt/src/evp.c
View File

@ -2497,9 +2497,9 @@ int wolfSSL_EVP_PKEY_derive(WOLFSSL_EVP_PKEY_CTX *ctx, unsigned char *key, size_
#endif #endif
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wc_ecc_shared_secret_ssh((ecc_key*)ctx->pkey->ecc->internal, if (wc_ecc_shared_secret((ecc_key*)ctx->pkey->ecc->internal,
(ecc_point*)ctx->peerKey->ecc->pub_key->internal, (ecc_key*)ctx->peerKey->ecc->internal, key, &len32)
key, &len32) != MP_OKAY) { != MP_OKAY) {
WOLFSSL_MSG("wc_ecc_shared_secret failed"); WOLFSSL_MSG("wc_ecc_shared_secret failed");
#if defined(ECC_TIMING_RESISTANT) && !defined(HAVE_SELFTEST) \ #if defined(ECC_TIMING_RESISTANT) && !defined(HAVE_SELFTEST) \
&& (!defined(HAVE_FIPS) || \ && (!defined(HAVE_FIPS) || \

4
wolfcrypt/test/test.c
View File

@ -28310,7 +28310,9 @@ done:
#endif #endif
#if defined(HAVE_ECC_DHE) && !defined(WC_NO_RNG) && \ #if defined(HAVE_ECC_DHE) && !defined(WC_NO_RNG) && \
!defined(WOLF_CRYPTO_CB_ONLY_ECC) !defined(WOLF_CRYPTO_CB_ONLY_ECC) && !defined(WOLFSSL_ATECC508A) && \
!defined(WOLFSSL_ATECC608A) && !defined(PLUTON_CRYPTO_ECC) && \
!defined(WOLFSSL_CRYPTOCELL)
static wc_test_ret_t ecc_ssh_test(ecc_key* key, WC_RNG* rng) static wc_test_ret_t ecc_ssh_test(ecc_key* key, WC_RNG* rng)
{ {
wc_test_ret_t ret; wc_test_ret_t ret;

6
wolfssl/wolfcrypt/ecc.h
View File

@ -659,10 +659,8 @@ WOLFSSL_LOCAL
int wc_ecc_shared_secret_gen_sync(ecc_key* private_key, int wc_ecc_shared_secret_gen_sync(ecc_key* private_key,
ecc_point* point, byte* out, word32* outlen); ecc_point* point, byte* out, word32* outlen);
#if defined(WOLFSSL_ATECC508A) || defined(WOLFSSL_ATECC608A) || \ #if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) && \
defined(PLUTON_CRYPTO_ECC) || defined(WOLFSSL_CRYPTOCELL) !defined(PLUTON_CRYPTO_ECC) && !defined(WOLFSSL_CRYPTOCELL)
#define wc_ecc_shared_secret_ssh wc_ecc_shared_secret
#else
#define wc_ecc_shared_secret_ssh wc_ecc_shared_secret_ex /* For backwards compat */ #define wc_ecc_shared_secret_ssh wc_ecc_shared_secret_ex /* For backwards compat */
#endif #endif