nettika/buffybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle CRYPTTAB_TRIED and CRYPTTAB_SOURCE

Browse source 
Fixes: #16
This commit is contained in:
Johannes Marbach 2021-10-08 21:20:39 +02:00
parent fbf04e917f
commit ffc43a4fee
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
command_line.c
View file

@ -69,6 +69,10 @@ static void print_usage() {
/*-------------------------------- 78 CHARS --------------------------------*/ /*-------------------------------- 78 CHARS --------------------------------*/
"Usage: unl0kr [OPTION]\n" "Usage: unl0kr [OPTION]\n"
"\n" "\n"
"Unl0kr values the `CRYPTTAB_TRIED` and `CRYPTTAB_SOURCE` environment\n"
"variables. Upon completion, the entered password is printed on STDOUT. All\n"
"other output happens on STDERR.\n"
"\n"
"Mandatory arguments to long options are mandatory for short options too.\n" "Mandatory arguments to long options are mandatory for short options too.\n"
" -c, --config=PATH Locaton of the main config file. Defaults to\n" " -c, --config=PATH Locaton of the main config file. Defaults to\n"
" /etc/unl0kr.conf.\n" " /etc/unl0kr.conf.\n"

14
main.c
View file

@ -412,10 +412,18 @@ int main(int argc, char *argv[]) {
lv_obj_set_size(spangroup, hor_res - 40, 2 * row_height); lv_obj_set_size(spangroup, hor_res - 40, 2 * row_height);
lv_obj_align(spangroup, LV_ALIGN_CENTER, 0, ver_res / 2 - keyboard_height); lv_obj_align(spangroup, LV_ALIGN_CENTER, 0, ver_res / 2 - keyboard_height);
lv_span_t *span1 = lv_spangroup_new_span(spangroup); lv_span_t *span1 = lv_spangroup_new_span(spangroup);
lv_span_set_text(span1, "Password required to unlock ");
lv_span_t *span2 = lv_spangroup_new_span(spangroup); lv_span_t *span2 = lv_spangroup_new_span(spangroup);
lv_span_set_text(span2, "/dev/sda1"); lv_span_t *span3 = lv_spangroup_new_span(spangroup);
lv_style_set_text_color(&span2->style, lv_palette_main(LV_PALETTE_RED));
/* Label text */
const char *crypttab_tried = getenv("CRYPTTAB_TRIED");
if (crypttab_tried && atoi(crypttab_tried) > 0) {
lv_span_set_text(span1, "Password incorrect. Please enter password to unlock ");
lv_span_set_text(span3, ".");
} else {
lv_span_set_text(span1, "Please enter password to unlock ");
}
lv_span_set_text(span2, getenv("CRYPTTAB_SOURCE"));
/* Keyboard (after textarea / label so that key popovers are not drawn over) */ /* Keyboard (after textarea / label so that key popovers are not drawn over) */
keyboard = lv_keyboard_create(lv_scr_act()); keyboard = lv_keyboard_create(lv_scr_act());