arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-21 22:08:08 +00:00
Code Issues Releases Wiki Activity

fix(core): Fix style and unix build.

Browse Source 
[no changelog]
This commit is contained in:
Andrew Kozlik 2024-06-24 11:20:51 +02:00 committed by Andrew Kozlik
parent da068fb32e
commit f396d00c67
3 changed files with 1474 additions and 1474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/embed/trezorhal/optiga/optiga.c
View File

@ -100,7 +100,7 @@ int optiga_sign(uint8_t index, const uint8_t *digest, size_t digest_size,
&signature[2], max_sig_size - 2, sig_size); &signature[2], max_sig_size - 2, sig_size);
if (ret == OPTIGA_ERR_CMD) { if (ret == OPTIGA_ERR_CMD) {
uint8_t error_code = 0; uint8_t error_code = 0;
(void) optiga_get_error_code(&error_code); (void)optiga_get_error_code(&error_code);
return error_code + OPTIGA_COMMAND_ERROR_OFFSET; return error_code + OPTIGA_COMMAND_ERROR_OFFSET;
} }
@ -672,7 +672,7 @@ int optiga_pin_verify_v4(OPTIGA_UI_PROGRESS ui_progress,
memzero(stretched_pin, sizeof(stretched_pin)); memzero(stretched_pin, sizeof(stretched_pin));
if (res == OPTIGA_ERR_CMD) { if (res == OPTIGA_ERR_CMD) {
uint8_t error_code = 0; uint8_t error_code = 0;
(void) optiga_get_error_code(&error_code); (void)optiga_get_error_code(&error_code);
return error_code + OPTIGA_COMMAND_ERROR_OFFSET; return error_code + OPTIGA_COMMAND_ERROR_OFFSET;
} }
@ -736,7 +736,7 @@ static int optiga_pin_stretch_hmac(
memzero(digest, sizeof(digest)); memzero(digest, sizeof(digest));
if (res != OPTIGA_SUCCESS) { if (res != OPTIGA_SUCCESS) {
uint8_t error_code = 0; uint8_t error_code = 0;
(void) optiga_get_error_code(&error_code); (void)optiga_get_error_code(&error_code);
if (error_code + OPTIGA_COMMAND_ERROR_OFFSET == if (error_code + OPTIGA_COMMAND_ERROR_OFFSET ==
OPTIGA_ERR_ACCESS_COND_NOT_SAT) { OPTIGA_ERR_ACCESS_COND_NOT_SAT) {
return OPTIGA_ERR_COUNTER_EXCEEDED; return OPTIGA_ERR_COUNTER_EXCEEDED;
@ -777,7 +777,7 @@ int optiga_pin_verify(OPTIGA_UI_PROGRESS ui_progress,
memzero(digest, sizeof(digest)); memzero(digest, sizeof(digest));
if (res == OPTIGA_ERR_CMD) { if (res == OPTIGA_ERR_CMD) {
uint8_t error_code = 0; uint8_t error_code = 0;
(void) optiga_get_error_code(&error_code); (void)optiga_get_error_code(&error_code);
return error_code + OPTIGA_COMMAND_ERROR_OFFSET; return error_code + OPTIGA_COMMAND_ERROR_OFFSET;
} }

6
core/embed/trezorhal/unix/optiga.c
View File

@ -156,7 +156,7 @@ bool optiga_random_buffer(uint8_t *dest, size_t size) {
int optiga_pin_set(OPTIGA_UI_PROGRESS ui_progress, int optiga_pin_set(OPTIGA_UI_PROGRESS ui_progress,
uint8_t stretched_pin[OPTIGA_PIN_SECRET_SIZE]) { uint8_t stretched_pin[OPTIGA_PIN_SECRET_SIZE]) {
ui_progress(OPTIGA_PIN_DERIVE_MS); ui_progress(OPTIGA_PIN_SET_MS);
return OPTIGA_SUCCESS; return OPTIGA_SUCCESS;
} }
@ -164,13 +164,13 @@ int optiga_pin_verify_v4(OPTIGA_UI_PROGRESS ui_progress,
const uint8_t pin_secret[OPTIGA_PIN_SECRET_SIZE], const uint8_t pin_secret[OPTIGA_PIN_SECRET_SIZE],
uint8_t out_secret[OPTIGA_PIN_SECRET_SIZE]) { uint8_t out_secret[OPTIGA_PIN_SECRET_SIZE]) {
memcpy(out_secret, pin_secret, OPTIGA_PIN_SECRET_SIZE); memcpy(out_secret, pin_secret, OPTIGA_PIN_SECRET_SIZE);
ui_progress(OPTIGA_PIN_DERIVE_MS); ui_progress(OPTIGA_PIN_VERIFY_MS);
return OPTIGA_SUCCESS; return OPTIGA_SUCCESS;
} }
int optiga_pin_verify(OPTIGA_UI_PROGRESS ui_progress, int optiga_pin_verify(OPTIGA_UI_PROGRESS ui_progress,
uint8_t stretched_pin[OPTIGA_PIN_SECRET_SIZE]) { uint8_t stretched_pin[OPTIGA_PIN_SECRET_SIZE]) {
ui_progress(OPTIGA_PIN_DERIVE_MS); ui_progress(OPTIGA_PIN_VERIFY_MS);
return OPTIGA_SUCCESS; return OPTIGA_SUCCESS;
} }

2934
tests/ui_tests/fixtures.json
View File

File diff suppressed because it is too large Load Diff