Skip to content

check hidden password #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2018
Merged

check hidden password #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/commander.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,10 @@ static int commander_process_backup_check(const char *key, const char *filename,
snprintf(seed, sizeof(seed), "%s", utils_uint8_to_hex(backup_hww, MEM_PAGE_LEN));
if (wallet_generate_node(key, seed, &node) == DBB_ERROR) {
ret = DBB_ERROR;
} else if (!MEMEQ(node.private_key, wallet_get_master(), MEM_PAGE_LEN) ||
!MEMEQ(node.chain_code, wallet_get_chaincode(), MEM_PAGE_LEN)) {
ret = DBB_ERROR;
} else {
ret = DBB_OK;
uint8_t main_ok = MEMEQ(node.private_key, memory_master_hww(NULL), MEM_PAGE_LEN) && MEMEQ(node.chain_code, memory_master_hww_chaincode(NULL), MEM_PAGE_LEN);
uint8_t hidden_ok = MEMEQ(node.private_key, memory_hidden_hww(NULL), MEM_PAGE_LEN) && MEMEQ(node.chain_code, memory_hidden_hww_chaincode(NULL), MEM_PAGE_LEN);
ret = (main_ok | hidden_ok) ? DBB_OK : DBB_ERROR; // bitwise for constant time
}
utils_zero(seed, sizeof(seed));
}
Expand Down
16 changes: 16 additions & 0 deletions tests/tests_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,26 @@ static void tests_seed_xpub_backup(void)
api_format_send_cmd(cmd_str(CMD_backup), back, KEY_STANDARD);
ASSERT_SUCCESS;


snprintf(check, sizeof(check), "{\"check\":\"%s\", \"key\":\"password\"}", filename);
api_format_send_cmd(cmd_str(CMD_backup), check, KEY_STANDARD);
ASSERT_SUCCESS;

{
// Check backup should also work with the hidden password.
char set_hidden_wallet_cmd[512];
snprintf(set_hidden_wallet_cmd, sizeof(set_hidden_wallet_cmd), "{\"%s\":\"%s\",\"%s\":\"%s\"}", cmd_str(CMD_password),
hidden_pwd, cmd_str(CMD_key), "hiddenpassword");
api_format_send_cmd(cmd_str(CMD_hidden_password), set_hidden_wallet_cmd, KEY_STANDARD);
ASSERT_SUCCESS;


snprintf(check, sizeof(check), "{\"check\":\"%s\", \"key\":\"hiddenpassword\"}", filename);
api_format_send_cmd(cmd_str(CMD_backup), check, KEY_STANDARD);
ASSERT_SUCCESS;
}


api_format_send_cmd(cmd_str(CMD_seed), seed_create_2, KEY_STANDARD);
ASSERT_REPORT_HAS_NOT(attr_str(ATTR_error));

Expand Down