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

For ED255219 and ED448 if importing private only and public key is already set then check it.

Browse Source
This commit is contained in:
David Garske
2022-07-01 12:53:39 -07:00
parent 2c943282f0
commit bb68766bda
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wolfcrypt/src/ed25519.c
View File

@ -1054,6 +1054,11 @@ int wc_ed25519_import_private_only(const byte* priv, word32 privSz,
XMEMCPY(key->k, priv, ED25519_KEY_SIZE);
key->privKeySet = 1;
if (key->pubKeySet) {
/* Validate loaded public key */
return wc_ed25519_check_key(key);
}
return 0;
}

5
wolfcrypt/src/ed448.c
View File

@ -997,6 +997,11 @@ int wc_ed448_import_private_only(const byte* priv, word32 privSz,
key->privKeySet = 1;
}
if ((ret == 0) && key->pubKeySet) {
/* Validate loaded public key */
ret = wc_ed448_check_key(key);
}
return ret;
}

12
wolfssl/wolfcrypt/types.h
View File

@ -44,8 +44,8 @@ decouple library dependencies with standard string, memory and so on.
/*
* This struct is used multiple time by other structs and
* needs to be defined somwhere that all structs can import
* (with minimal depencencies).
* needs to be defined somewhere that all structs can import
* (with minimal dependencies).
*/
#ifdef HAVE_EX_DATA
#ifdef HAVE_EX_DATA_CLEANUP_HOOKS
@ -208,14 +208,14 @@ decouple library dependencies with standard string, memory and so on.
#elif defined(WC_16BIT_CPU)
#undef WORD64_AVAILABLE
typedef word16 wolfssl_word;
#define MP_16BIT /* for mp_int, mp_word needs to be twice as big as
mp_digit, no 64 bit type so make mp_digit 16 bit */
#define MP_16BIT /* for mp_int, mp_word needs to be twice as big as \
* mp_digit, no 64 bit type so make mp_digit 16 bit */
#else
#undef WORD64_AVAILABLE
typedef word32 wolfssl_word;
#define MP_16BIT /* for mp_int, mp_word needs to be twice as big as
mp_digit, no 64 bit type so make mp_digit 16 bit */
#define MP_16BIT /* for mp_int, mp_word needs to be twice as big as \
* mp_digit, no 64 bit type so make mp_digit 16 bit */
#endif
typedef struct w64wrapper {