diff options
| author | Matthew Garrett <mjg@redhat.com> | 2012-10-24 01:14:50 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2012-10-24 01:14:50 -0400 |
| commit | d77f421bccf00722192a0cc90dddae05b1b74f91 (patch) | |
| tree | c2f7112b881a44d40d07b91a8e6b367e784ce79c /MokManager.c | |
| parent | 8a1690683f2d5691e3a58bef2a24f347d762f91d (diff) | |
| download | efi-boot-shim-d77f421bccf00722192a0cc90dddae05b1b74f91.tar.gz efi-boot-shim-d77f421bccf00722192a0cc90dddae05b1b74f91.zip | |
Clean up password setting
Permit clearing of the password, and avoid a case where choosing not to set
a password would result in an error message on exit. Fix the same problem
with MokSB.
Diffstat (limited to 'MokManager.c')
| -rw-r--r-- | MokManager.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/MokManager.c b/MokManager.c index 2fbda848..eb5bb919 100644 --- a/MokManager.c +++ b/MokManager.c @@ -703,8 +703,6 @@ static INTN mok_sb_prompt (void *MokSB, void *data2, void *data3) { UINT8 sbval = 1; UINT8 pos1, pos2, pos3; - LibDeleteVariable(L"MokSB", &shim_lock_guid); - if (MokSBSize != sizeof(MokSBvar)) { Print(L"Invalid MokSB variable contents\n"); return -1; @@ -776,6 +774,8 @@ static INTN mok_sb_prompt (void *MokSB, void *data2, void *data3) { &shim_lock_guid); } + LibDeleteVariable(L"MokSB", &shim_lock_guid); + Print(L"Press a key to reboot system\n"); Pause(); uefi_call_wrapper(RT->ResetSystem, 4, EfiResetWarm, @@ -804,10 +804,25 @@ static INTN mok_pw_prompt (void *MokPW, void *data2, void *data3) { return -1; } - LibDeleteVariable(L"MokPW", &shim_lock_guid); - uefi_call_wrapper(ST->ConOut->ClearScreen, 1, ST->ConOut); + SetMem(hash, SHA256_DIGEST_SIZE, 0); + + if (CompareMem(MokPW, hash, SHA256_DIGEST_SIZE) == 0) { + Print(L"Clear MOK password? (y/n): "); + + do { + get_line (&length, line, 1, 1); + + if (line[0] == 'Y' || line[0] == 'y') { + LibDeleteVariable(L"MokPWStore", &shim_lock_guid); + LibDeleteVariable(L"MokPW", &shim_lock_guid); + } + } while (line[0] != 'N' && line[0] != 'n'); + + return 0; + } + while (fail_count < 3) { Print(L"Confirm MOK passphrase: "); get_line(&length, password, PASSWORD_MAX, 0); @@ -857,6 +872,8 @@ static INTN mok_pw_prompt (void *MokPW, void *data2, void *data3) { return -1; } + LibDeleteVariable(L"MokPW", &shim_lock_guid); + Print(L"Press a key to reboot system\n"); Pause(); uefi_call_wrapper(RT->ResetSystem, 4, EfiResetWarm, |