proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-08-08 02:05:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the same function to get commands and password

Browse Source
This commit is contained in:
Gary Ching-Pang Lin 2012-10-04 17:23:18 +08:00
parent 419c5e3577
commit 8bddd68127
1 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
MokManager.c
View File

@ -392,57 +392,15 @@ static UINT8 list_keys (void *MokNew, UINTN MokNewSize)
return 1; return 1;
} }
static UINT8 mok_enrollment_prompt (void *MokNew, UINTN MokNewSize) static UINT8 get_line (UINT32 *length, CHAR16 *line, UINT32 line_max, UINT8 show)
{ {
EFI_INPUT_KEY key; EFI_INPUT_KEY key;
do {
if (!list_keys(MokNew, MokNewSize)) {
return 0;
}
Print(L"Enroll the key(s) or list the key(s) again? (y/n/l): ");
key = get_keystroke();
Print(L"%c\n", key.UnicodeChar);
if (key.UnicodeChar == 'Y' || key.UnicodeChar == 'y') {
return 1;
}
} while (key.UnicodeChar == 'L' || key.UnicodeChar == 'l');
Print(L"Abort\n");
return 0;
}
static UINT8 mok_deletion_prompt () {
EFI_INPUT_KEY key;
Print(L"Erase all stored keys? (y/N): ");
key = get_keystroke();
Print(L"%c\n", key.UnicodeChar);
if (key.UnicodeChar == 'Y' || key.UnicodeChar == 'y') {
return 1;
}
Print(L"Abort\n");
return 0;
}
static UINT8 get_password (UINT32 *length, CHAR16 *password)
{
EFI_INPUT_KEY key;
CHAR16 input[PASSWORD_MAX];
int count = 0; int count = 0;
do { do {
key = get_keystroke(); key = get_keystroke();
if ((count >= PASSWORD_MAX && if ((count >= line_max &&
key.UnicodeChar != CHAR_BACKSPACE) || key.UnicodeChar != CHAR_BACKSPACE) ||
key.UnicodeChar == CHAR_NULL || key.UnicodeChar == CHAR_NULL ||
key.UnicodeChar == CHAR_TAB || key.UnicodeChar == CHAR_TAB ||
@ -454,20 +412,67 @@ static UINT8 get_password (UINT32 *length, CHAR16 *password)
if (count == 0 && key.UnicodeChar == CHAR_BACKSPACE) { if (count == 0 && key.UnicodeChar == CHAR_BACKSPACE) {
continue; continue;
} else if (key.UnicodeChar == CHAR_BACKSPACE) { } else if (key.UnicodeChar == CHAR_BACKSPACE) {
input[--count] = '\0'; if (show) {
Print(L"\b");
}
line[--count] = '\0';
continue; continue;
} }
input[count++] = key.UnicodeChar; if (show) {
Print(L"%c", key.UnicodeChar);
}
line[count++] = key.UnicodeChar;
} while (key.UnicodeChar != CHAR_CARRIAGE_RETURN); } while (key.UnicodeChar != CHAR_CARRIAGE_RETURN);
Print(L"\n"); Print(L"\n");
*length = count; *length = count;
CopyMem(password, input, count * sizeof(CHAR16));
return 1; return 1;
} }
static UINT8 mok_enrollment_prompt (void *MokNew, UINTN MokNewSize)
{
CHAR16 line[1];
UINT32 length;
do {
if (!list_keys(MokNew, MokNewSize)) {
return 0;
}
Print(L"Enroll the key(s)? (y/n): ");
get_line (&length, line, 1, 1);
if (line[0] == 'Y' || line[0] == 'y') {
return 1;
}
} while (line[0] != 'N' && line[0] != 'n');
Print(L"Abort\n");
return 0;
}
static UINT8 mok_deletion_prompt () {
CHAR16 line[1];
UINT32 length;
Print(L"Erase all stored keys? (y/N): ");
get_line (&length, line, 1, 1);
if (line[0] == 'Y' || line[0] == 'y') {
return 1;
}
Print(L"Abort\n");
return 0;
}
static EFI_STATUS compute_pw_hash (void *MokNew, UINTN MokNewSize, CHAR16 *password, static EFI_STATUS compute_pw_hash (void *MokNew, UINTN MokNewSize, CHAR16 *password,
UINT32 pw_length, UINT8 *hash) UINT32 pw_length, UINT8 *hash)
{ {
@ -538,7 +543,7 @@ static EFI_STATUS store_keys (void *MokNew, UINTN MokNewSize)
while (fail_count < 3) { while (fail_count < 3) {
Print(L"Password(%d-%d characters): ", Print(L"Password(%d-%d characters): ",
PASSWORD_MIN, PASSWORD_MAX); PASSWORD_MIN, PASSWORD_MAX);
get_password(&pw_length, password); get_line(&pw_length, password, PASSWORD_MAX, 0);
if (pw_length < 8) { if (pw_length < 8) {
Print(L"At least %d characters for the password\n", Print(L"At least %d characters for the password\n",