From 7212982385dfc471be076e446da646d8e118e692 Mon Sep 17 00:00:00 2001 From: Conor Patrick Date: Sun, 27 Oct 2019 08:58:34 -0400 Subject: [PATCH] remove hacker macros --- fido2/ctaphid.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fido2/ctaphid.c b/fido2/ctaphid.c index 7899b65..eec0122 100644 --- a/fido2/ctaphid.c +++ b/fido2/ctaphid.c @@ -696,7 +696,7 @@ uint8_t ctaphid_custom_command(int len, CTAP_RESPONSE * ctap_resp, CTAPHID_WRITE { ctap_response_init(ctap_resp); -#if !defined(IS_BOOTLOADER) && (defined(SOLO_HACKER) || defined(SOLO_EXPERIMENTAL)) +#if !defined(IS_BOOTLOADER) && (defined(SOLO_EXPERIMENTAL)) uint32_t param; #endif #if defined(IS_BOOTLOADER) @@ -716,17 +716,13 @@ uint8_t ctaphid_custom_command(int len, CTAP_RESPONSE * ctap_resp, CTAPHID_WRITE ctaphid_write(wb, NULL, 0); return 1; #endif -#if defined(SOLO_HACKER) +#if defined(SOLO) case CTAPHID_ENTERBOOT: printf1(TAG_HID,"CTAPHID_ENTERBOOT\n"); boot_solo_bootloader(); wb->bcnt = 0; ctaphid_write(wb, NULL, 0); return 1; - case CTAPHID_ENTERSTBOOT: - printf1(TAG_HID,"CTAPHID_ENTERBOOT\n"); - boot_st_bootloader(); - return 1; #endif #if !defined(IS_BOOTLOADER) @@ -754,7 +750,7 @@ uint8_t ctaphid_custom_command(int len, CTAP_RESPONSE * ctap_resp, CTAPHID_WRITE return 1; break; -#if !defined(IS_BOOTLOADER) && (defined(SOLO_HACKER) || defined(SOLO_EXPERIMENTAL)) +#if !defined(IS_BOOTLOADER) && (defined(SOLO_EXPERIMENTAL)) case CTAPHID_LOADKEY: /** * Load external key. Useful for enabling backups.