WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for async ECC shared secret. ZD 15938

pull/6266/head
David Garske 2023-04-04 14:17:57 -07:00
parent 73b3f9c01a
commit 72ffa743a0
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/async.yml vendored
View File

@ -10,6 +10,7 @@ jobs:
config: [ config: [
# Add new configs here # Add new configs here
'--enable-asynccrypt --enable-all --enable-dtls13', '--enable-asynccrypt --enable-all --enable-dtls13',
'--enable-asynccrypt-sw',
] ]
name: make check name: make check
runs-on: ubuntu-latest runs-on: ubuntu-latest

15
wolfcrypt/src/ecc.c
View File

@ -4455,7 +4455,7 @@ int wc_ecc_shared_secret(ecc_key* private_key, ecc_key* public_key, byte* out,
!defined(WOLFSSL_CRYPTOCELL) && !defined(WOLFSSL_KCAPI_ECC) && \ !defined(WOLFSSL_CRYPTOCELL) && !defined(WOLFSSL_KCAPI_ECC) && \
!defined(WOLF_CRYPTO_CB_ONLY_ECC) !defined(WOLF_CRYPTO_CB_ONLY_ECC)
static int wc_ecc_shared_secret_gen_sync(ecc_key* private_key, ecc_point* point, int wc_ecc_shared_secret_gen_sync(ecc_key* private_key, ecc_point* point,
byte* out, word32* outlen) byte* out, word32* outlen)
{ {
int err = MP_OKAY; int err = MP_OKAY;
@ -4749,11 +4749,6 @@ static int wc_ecc_shared_secret_gen_async(ecc_key* private_key,
&curve->Af->raw, &curve->Bf->raw, &curve->prime->raw, &curve->Af->raw, &curve->Bf->raw, &curve->prime->raw,
private_key->dp->cofactor); private_key->dp->cofactor);
#endif #endif
if (err == WC_PENDING_E) {
/* advance state, next call will handle return code processing */
private_key->state++;
}
} }
else else
#elif defined(WOLFSSL_ASYNC_CRYPT_SW) #elif defined(WOLFSSL_ASYNC_CRYPT_SW)
@ -4772,6 +4767,10 @@ static int wc_ecc_shared_secret_gen_async(ecc_key* private_key,
err = wc_ecc_shared_secret_gen_sync(private_key, point, out, outlen); err = wc_ecc_shared_secret_gen_sync(private_key, point, out, outlen);
} }
if (err == WC_PENDING_E) {
private_key->state++;
}
#if defined(HAVE_CAVIUM_V) || defined(HAVE_INTEL_QA) #if defined(HAVE_CAVIUM_V) || defined(HAVE_INTEL_QA)
wc_ecc_curve_free(curve); wc_ecc_curve_free(curve);
FREE_CURVE_SPECS(); FREE_CURVE_SPECS();
@ -4826,8 +4825,7 @@ int wc_ecc_shared_secret_ex(ecc_key* private_key, ecc_point* point,
err = wc_ecc_shared_secret_gen_async(private_key, point, err = wc_ecc_shared_secret_gen_async(private_key, point,
out, outlen); out, outlen);
if (err == 0) { if (err == 0) {
/* advance state and exit early */ /* exit early */
private_key->state++;
RESTORE_VECTOR_REGISTERS(); RESTORE_VECTOR_REGISTERS();
return err; return err;
} }
@ -8352,6 +8350,7 @@ static int ecc_verify_hash(mp_int *r, mp_int *s, const byte* hash,
if (NitroxEccIsCurveSupported(key)) if (NitroxEccIsCurveSupported(key))
#endif #endif
{ {
word32 keySz = (word32)key->dp->size;
err = wc_mp_to_bigint_sz(e, &e->raw, keySz); err = wc_mp_to_bigint_sz(e, &e->raw, keySz);
if (err == MP_OKAY) if (err == MP_OKAY)
err = wc_mp_to_bigint_sz(key->pubkey.x, &key->pubkey.x->raw, keySz); err = wc_mp_to_bigint_sz(key->pubkey.x, &key->pubkey.x->raw, keySz);

5
wolfssl/wolfcrypt/ecc.h
View File

@ -604,6 +604,11 @@ WOLFSSL_API
int wc_ecc_shared_secret_ex(ecc_key* private_key, ecc_point* point, int wc_ecc_shared_secret_ex(ecc_key* private_key, ecc_point* point,
byte* out, word32 *outlen); byte* out, word32 *outlen);
/* Internal API for blocking ECDHE call */
WOLFSSL_LOCAL
int wc_ecc_shared_secret_gen_sync(ecc_key* private_key,
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 #define wc_ecc_shared_secret_ssh wc_ecc_shared_secret