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

Clear meaning for the return value of iotsafe_gen_keypair

Browse Source
This commit is contained in:
Daniele Lacamera
2021-12-02 16:16:29 +01:00
parent 4d483b0a28
commit 5da89c6275
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wolfcrypt/src/port/iotsafe/iotsafe.c
View File

@@ -585,6 +585,13 @@ static int iotsafe_parse_public_key(char* resp, int len, ecc_key *key)
return 0; return 0;
} }
/* Execute GEN_KEYPAIR on the IoT-SAFE applet.
*
* Return -1 on error; 0 if the operation is successful, but
* the generated public key was not yet stored in `key`; 1 if
* the operation is successful and the public key was found in the
* command response and copied to the `key` structure.
*/
static int iotsafe_gen_keypair(byte *wr_slot, unsigned long id_size, static int iotsafe_gen_keypair(byte *wr_slot, unsigned long id_size,
ecc_key *key) ecc_key *key)
{ {
@@ -598,9 +605,15 @@ static int iotsafe_gen_keypair(byte *wr_slot, unsigned long id_size,
WOLFSSL_MSG("Unexpected reply from Keygen"); WOLFSSL_MSG("Unexpected reply from Keygen");
ret = WC_HW_E; ret = WC_HW_E;
} else { } else {
if (!iotsafe_parse_public_key(resp, ret, key)) { if (iotsafe_parse_public_key(resp, ret, key) == 0) {
/* iotsafe_parse_public_key was successful on response.
* Return '1' here to indicate that the key is populated.
*/
ret = 1; ret = 1;
} else { } else {
/* The keygen operation was successful but we have not
* retrieved the generated public key yet.
*/
ret = 0; ret = 0;
} }
} }
@@ -1291,6 +1304,8 @@ int wc_iotsafe_ecc_gen_k_ex(byte *key_id, uint16_t id_size)
int ret = 0; int ret = 0;
ecc_key* key = XMALLOC(sizeof(ecc_key), NULL, DYNAMIC_TYPE_ECC); ecc_key* key = XMALLOC(sizeof(ecc_key), NULL, DYNAMIC_TYPE_ECC);
ret = iotsafe_gen_keypair(key_id, id_size, key); ret = iotsafe_gen_keypair(key_id, id_size, key);
if (ret > 0)
ret = 0;
XFREE(key, NULL, DYNAMIC_TYPE_ECC); XFREE(key, NULL, DYNAMIC_TYPE_ECC);
return ret; return ret;
} }
@@ -1324,6 +1339,8 @@ int wc_iotsafe_ecc_gen_k(byte key_id)
int ret = 0; int ret = 0;
ecc_key* key = XMALLOC(sizeof(ecc_key), NULL, DYNAMIC_TYPE_ECC); ecc_key* key = XMALLOC(sizeof(ecc_key), NULL, DYNAMIC_TYPE_ECC);
ret = iotsafe_gen_keypair(&key_id, 1, key); ret = iotsafe_gen_keypair(&key_id, 1, key);
if (ret > 0)
ret = 0;
XFREE(key, NULL, DYNAMIC_TYPE_ECC); XFREE(key, NULL, DYNAMIC_TYPE_ECC);
return ret; return ret;
} }