Compare commits
2 Commits
backup_imp
...
all-contri
Author | SHA1 | Date | |
---|---|---|---|
f9937546e0 | |||
459eb39e55 |
@ -1 +1 @@
|
|||||||
3.0.0
|
2.5.3
|
||||||
|
@ -760,37 +760,30 @@ uint8_t ctaphid_custom_command(int len, CTAP_RESPONSE * ctap_resp, CTAPHID_WRITE
|
|||||||
case CTAPHID_LOADKEY:
|
case CTAPHID_LOADKEY:
|
||||||
/**
|
/**
|
||||||
* Load external key. Useful for enabling backups.
|
* Load external key. Useful for enabling backups.
|
||||||
* bytes: 4 4 96
|
* bytes: 4 96
|
||||||
* payload: version [maj rev patch RFU]| counter_replacement (BE) | master_key |
|
* payload: | counter_increase (BE) | master_key |
|
||||||
*
|
*
|
||||||
* Counter should be increased by a large amount, e.g. (0x10000000)
|
* Counter should be increased by a large amount, e.g. (0x10000000)
|
||||||
* to outdo any previously lost/broken keys.
|
* to outdo any previously lost/broken keys.
|
||||||
*/
|
*/
|
||||||
printf1(TAG_HID,"CTAPHID_LOADKEY\n");
|
printf1(TAG_HID,"CTAPHID_LOADKEY\n");
|
||||||
if (len != 104)
|
if (len != 100)
|
||||||
{
|
{
|
||||||
printf2(TAG_ERR,"Error, invalid length.\n");
|
printf2(TAG_ERR,"Error, invalid length.\n");
|
||||||
ctaphid_send_error(wb->cid, CTAP1_ERR_INVALID_LENGTH);
|
ctaphid_send_error(wb->cid, CTAP1_ERR_INVALID_LENGTH);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
param = ctap_buffer[0] << 16;
|
|
||||||
param |= ctap_buffer[1] << 8;
|
|
||||||
param |= ctap_buffer[2] << 0;
|
|
||||||
if (param != 0){
|
|
||||||
ctaphid_send_error(wb->cid, CTAP2_ERR_UNSUPPORTED_OPTION);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ask for THREE button presses
|
// Ask for THREE button presses
|
||||||
if (ctap_user_presence_test(8000) > 0)
|
if (ctap_user_presence_test(8000) > 0)
|
||||||
if (ctap_user_presence_test(2000) > 0)
|
if (ctap_user_presence_test(8000) > 0)
|
||||||
if (ctap_user_presence_test(2000) > 0)
|
if (ctap_user_presence_test(8000) > 0)
|
||||||
{
|
{
|
||||||
ctap_load_external_keys(ctap_buffer + 8);
|
ctap_load_external_keys(ctap_buffer + 4);
|
||||||
param = ctap_buffer[7];
|
param = ctap_buffer[3];
|
||||||
param |= ctap_buffer[6] << 8;
|
param |= ctap_buffer[2] << 8;
|
||||||
param |= ctap_buffer[5] << 16;
|
param |= ctap_buffer[1] << 16;
|
||||||
param |= ctap_buffer[4] << 24;
|
param |= ctap_buffer[0] << 24;
|
||||||
ctap_atomic_count(param);
|
ctap_atomic_count(param);
|
||||||
|
|
||||||
wb->bcnt = 0;
|
wb->bcnt = 0;
|
||||||
|
@ -46,7 +46,9 @@ int main()
|
|||||||
{
|
{
|
||||||
uint8_t hidmsg[64];
|
uint8_t hidmsg[64];
|
||||||
uint32_t t1 = 0;
|
uint32_t t1 = 0;
|
||||||
|
#ifdef SOLO_HACKER
|
||||||
uint32_t stboot_time = 0;
|
uint32_t stboot_time = 0;
|
||||||
|
#endif
|
||||||
uint32_t boot = 1;
|
uint32_t boot = 1;
|
||||||
|
|
||||||
set_logging_mask(
|
set_logging_mask(
|
||||||
@ -96,6 +98,7 @@ int main()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef SOLO_HACKER
|
||||||
if (!is_bootloader_disabled())
|
if (!is_bootloader_disabled())
|
||||||
{
|
{
|
||||||
stboot_time = millis();
|
stboot_time = millis();
|
||||||
@ -105,6 +108,7 @@ int main()
|
|||||||
goto start_bootloader;
|
goto start_bootloader;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (is_authorized_to_boot() && (boot || is_bootloader_disabled()))
|
if (is_authorized_to_boot() && (boot || is_bootloader_disabled()))
|
||||||
{
|
{
|
||||||
@ -115,8 +119,9 @@ int main()
|
|||||||
|
|
||||||
printf1(TAG_RED,"Not authorized to boot (%08x == %08lx)\r\n", AUTH_WORD_ADDR, *(uint32_t*)AUTH_WORD_ADDR);
|
printf1(TAG_RED,"Not authorized to boot (%08x == %08lx)\r\n", AUTH_WORD_ADDR, *(uint32_t*)AUTH_WORD_ADDR);
|
||||||
}
|
}
|
||||||
|
#ifdef SOLO_HACKER
|
||||||
start_bootloader:
|
start_bootloader:
|
||||||
|
#endif
|
||||||
SystemClock_Config();
|
SystemClock_Config();
|
||||||
init_gpio();
|
init_gpio();
|
||||||
init_millisecond_timer(0);
|
init_millisecond_timer(0);
|
||||||
|
@ -560,11 +560,7 @@ uint32_t ctap_atomic_count(uint32_t amount)
|
|||||||
return lastc;
|
return lastc;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (amount > 256){
|
lastc += amount;
|
||||||
lastc = amount;
|
|
||||||
} else {
|
|
||||||
lastc += amount;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lastc/256 > erases)
|
if (lastc/256 > erases)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user