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

improve ED25519 key handling in CryptoCb function

Browse Source
This commit is contained in:
Maxim Kostin
2025-06-11 21:09:22 +02:00
parent 60f442b04e
commit f865e0de97
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wolfcrypt/src/port/tropicsquare/tropic01.c
View File

@ -243,19 +243,28 @@ int Tropic01_CryptoCb(int devId, wc_CryptoInfo* info, void* ctx)
TROPIC01_ED25519_PRIV_KEY_SIZE); TROPIC01_ED25519_PRIV_KEY_SIZE);
if (ret != 0) { if (ret != 0) {
WOLFSSL_MSG_EX( WOLFSSL_MSG_EX(
"TROPIC01: CryptoCB: Failed to get ED25519 key, ret=%d", "TROPIC01: CryptoCB: Failed to get ED25519 PRIVkey,ret=%d",
ret);
return ret;
}
ret = Tropic01_GetKeyECC(
info->pk.ed25519sign.key->p,
TROPIC01_ED25519_PUB_RMEM_SLOT_DEFAULT,
TROPIC01_ED25519_PUB_KEY_SIZE);
if (ret != 0) {
WOLFSSL_MSG_EX(
"TROPIC01: CryptoCB: Failed to get ED25519 PUBkey,ret=%d",
ret); ret);
return ret; return ret;
} }
/* set devId to invalid, so software is used */ /* set devId to invalid, so software is used */
info->pk.ed25519sign.key->devId = INVALID_DEVID; info->pk.ed25519sign.key->devId = INVALID_DEVID;
info->pk.ed25519sign.key->privKeySet = 1;
info->pk.ed25519sign.key->pubKeySet = 1; info->pk.ed25519sign.key->pubKeySet = 1;
ret = wc_ed25519_sign_msg(
ret = wc_ed25519_sign_msg_ex(
info->pk.ed25519sign.in, info->pk.ed25519sign.inLen, info->pk.ed25519sign.in, info->pk.ed25519sign.inLen,
info->pk.ed25519sign.out, info->pk.ed25519sign.outLen, info->pk.ed25519sign.out, info->pk.ed25519sign.outLen,
info->pk.ed25519sign.key, info->pk.ed25519sign.type, info->pk.ed25519sign.key);
info->pk.ed25519sign.context, info->pk.ed25519sign.contextLen);
/* reset devId */ /* reset devId */
info->pk.ed25519sign.key->devId = devId; info->pk.ed25519sign.key->devId = devId;
@ -266,7 +275,7 @@ int Tropic01_CryptoCb(int devId, wc_CryptoInfo* info, void* ctx)
WOLFSSL_MSG("TROPIC01: CryptoCB: ED25519 verification request"); WOLFSSL_MSG("TROPIC01: CryptoCB: ED25519 verification request");
/* retrieve public key from TROPIC01 secure R memory */ /* retrieve public key from TROPIC01 secure R memory */
ret = Tropic01_GetKeyECC( ret = Tropic01_GetKeyECC(
info->pk.ed25519sign.key->p, info->pk.ed25519verify.key->p,
TROPIC01_ED25519_PUB_RMEM_SLOT_DEFAULT, TROPIC01_ED25519_PUB_RMEM_SLOT_DEFAULT,
TROPIC01_ED25519_PUB_KEY_SIZE); TROPIC01_ED25519_PUB_KEY_SIZE);
if (ret != 0) { if (ret != 0) {
@ -278,12 +287,11 @@ int Tropic01_CryptoCb(int devId, wc_CryptoInfo* info, void* ctx)
/* set devId to invalid, so software is used */ /* set devId to invalid, so software is used */
info->pk.ed25519verify.key->devId = INVALID_DEVID; info->pk.ed25519verify.key->devId = INVALID_DEVID;
info->pk.ed25519verify.key->pubKeySet = 1;
ret = wc_ed25519_verify_msg_ex( ret = wc_ed25519_verify_msg(
info->pk.ed25519verify.sig, info->pk.ed25519verify.sigLen, info->pk.ed25519verify.sig, info->pk.ed25519verify.sigLen,
info->pk.ed25519verify.msg, info->pk.ed25519verify.msgLen, info->pk.ed25519verify.msg, info->pk.ed25519verify.msgLen,
info->pk.ed25519verify.res, info->pk.ed25519verify.key, info->pk.ed25519verify.res, info->pk.ed25519verify.key);
info->pk.ed25519verify.type, NULL, 0);
/* reset devId */ /* reset devId */
info->pk.ed25519verify.key->devId = devId; info->pk.ed25519verify.key->devId = devId;