Skip to content
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.

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

Picopass: typo #76

Merged
merged 1 commit into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions picopass/scenes/picopass_scene_elite_dict_attack.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

enum {
PicopassSceneEliteDictAttackDictEliteUser,
PicopassSceneEliteDictAttackDictStandart,
PicopassSceneEliteDictAttackDictStandard,
PicopassSceneEliteDictAttackDictElite,
};

const char* picopass_dict_name[] = {
[PicopassSceneEliteDictAttackDictEliteUser] = "Elite User Dictionary",
[PicopassSceneEliteDictAttackDictStandart] = "Standard System Dictionary",
[PicopassSceneEliteDictAttackDictStandard] = "Standard System Dictionary",
[PicopassSceneEliteDictAttackDictElite] = "Elite System Dictionary",
};

Expand All @@ -31,8 +31,8 @@ static bool picopass_elite_dict_attack_change_dict(Picopass* picopass) {
PICOPASS_ICLASS_STANDARD_DICT_FLIPPER_NAME,
NfcDictModeOpenExisting,
PICOPASS_KEY_LEN);
scene_state = PicopassSceneEliteDictAttackDictStandart;
} else if(scene_state == PicopassSceneEliteDictAttackDictStandart) {
scene_state = PicopassSceneEliteDictAttackDictStandard;
} else if(scene_state == PicopassSceneEliteDictAttackDictStandard) {
if(!nfc_dict_check_presence(PICOPASS_ICLASS_ELITE_DICT_FLIPPER_NAME)) break;
picopass->dict = nfc_dict_alloc(
PICOPASS_ICLASS_ELITE_DICT_FLIPPER_NAME,
Expand Down Expand Up @@ -76,7 +76,7 @@ NfcCommand picopass_elite_dict_attack_worker_callback(PicopassPollerEvent event,
scene_manager_get_scene_state(picopass->scene_manager, PicopassSceneEliteDictAttack);
memcpy(event.data->req_key.key, key, PICOPASS_KEY_LEN);
event.data->req_key.is_elite_key =
(scene_state != PicopassSceneEliteDictAttackDictStandart);
(scene_state != PicopassSceneEliteDictAttackDictStandard);
event.data->req_key.is_key_provided = is_key_provided;
if(is_key_provided) {
picopass->dict_attack_ctx.current_key++;
Expand Down Expand Up @@ -151,7 +151,7 @@ void picopass_scene_elite_dict_attack_on_enter(void* context) {
} else {
picopass->dict = nfc_dict_alloc(
PICOPASS_ICLASS_STANDARD_DICT_FLIPPER_NAME, NfcDictModeOpenExisting, PICOPASS_KEY_LEN);
state = PicopassSceneEliteDictAttackDictStandart;
state = PicopassSceneEliteDictAttackDictStandard;
}
picopass->dict_attack_ctx.card_detected = true;
picopass->dict_attack_ctx.total_keys = nfc_dict_get_total_keys(picopass->dict);
Expand Down
6 changes: 3 additions & 3 deletions picopass/scenes/picopass_scene_read_card.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "../picopass_keys.h"

enum {
PicopassSceneReadCardDictStandart,
PicopassSceneReadCardDictStandard,
PicopassSceneReadCardDictElite,
};

Expand Down Expand Up @@ -78,7 +78,7 @@ void picopass_scene_read_card_on_enter(void* context) {
picopass->dict = nfc_dict_alloc(
PICOPASS_ICLASS_STANDARD_DICT_FLIPPER_NAME, NfcDictModeOpenExisting, PICOPASS_KEY_LEN);
scene_manager_set_scene_state(
picopass->scene_manager, PicopassSceneReadCard, PicopassSceneReadCardDictStandart);
picopass->scene_manager, PicopassSceneReadCard, PicopassSceneReadCardDictStandard);
// Start worker
picopass->poller = picopass_poller_alloc(picopass->nfc);
picopass_poller_start(picopass->poller, picopass_read_card_worker_callback, picopass);
Expand Down Expand Up @@ -120,7 +120,7 @@ void picopass_scene_read_card_on_exit(void* context) {
// Clear view
popup_reset(picopass->popup);
scene_manager_set_scene_state(
picopass->scene_manager, PicopassSceneReadCard, PicopassSceneReadCardDictStandart);
picopass->scene_manager, PicopassSceneReadCard, PicopassSceneReadCardDictStandard);

picopass_blink_stop(picopass);
}