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.

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

Jump to bottom

Desktop: Sanity check PIN length for good measure #3879

Merged
merged 3 commits into from
Sep 6, 2024
Merged

Desktop: Sanity check PIN length for good measure #3879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dba7b8
Desktop: Sanity check PIN length for good measure
Willy-JL Sep 1, 2024
e1edcc0
Merge branch 'dev' into desktop-pin-length-sanity-check
skotopes Sep 6, 2024
b06d85f
Desktop: replace hardcoded values with macros in desktop_view_pin_inp…
skotopes Sep 6, 2024
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
3 changes: 2 additions & 1 deletion applications/services/desktop/helpers/pin_code.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ static uint32_t desktop_pin_code_pack(const DesktopPinCode* pin_code) {
}

bool desktop_pin_code_is_set(void) {
return furi_hal_rtc_get_pin_value() >> DESKTOP_PIN_CODE_LENGTH_OFFSET;
uint8_t length = furi_hal_rtc_get_pin_value() >> DESKTOP_PIN_CODE_LENGTH_OFFSET;
return length >= DESKTOP_PIN_CODE_MIN_LEN && length <= DESKTOP_PIN_CODE_MAX_LEN;
}

void desktop_pin_code_set(const DesktopPinCode* pin_code) {
Expand Down
1 change: 1 addition & 0 deletions applications/services/desktop/helpers/pin_code.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <stdint.h>
#include <stdbool.h>

#define DESKTOP_PIN_CODE_MIN_LEN (4)
#define DESKTOP_PIN_CODE_MAX_LEN (10)

typedef struct {
Expand Down
4 changes: 2 additions & 2 deletions applications/services/desktop/views/desktop_view_pin_input.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define DEFAULT_PIN_X 64
#define DEFAULT_PIN_Y 32

#define MIN_PIN_LENGTH 4
#define MIN_PIN_LENGTH DESKTOP_PIN_CODE_MIN_LEN
#define MAX_PIN_LENGTH DESKTOP_PIN_CODE_MAX_LEN

struct DesktopViewPinInput {
Expand Down Expand Up @@ -103,7 +103,7 @@ static void desktop_view_pin_input_draw_cells(Canvas* canvas, DesktopViewPinInpu
furi_assert(canvas);
furi_assert(model);

uint8_t draw_pin_size = MAX(4, model->pin.length + 1);
uint8_t draw_pin_size = MAX(MIN_PIN_LENGTH, model->pin.length + 1);
if(model->locked_input || (model->pin.length == MAX_PIN_LENGTH)) {
draw_pin_size = model->pin.length;
}
Expand Down
Loading