Commit Graph

1510 Commits

Author SHA1 Message Date
Gary Ching-Pang Lin
4bab48ce88 Make sure the menu shows when the callback fails
Since Pause() doesn't clear the key from the input queue, the next
ReadKeyStroke reads the queued key instead of the new one. If the
user presses "Enter", MokManager exits directly without showing
the menu again.
2013-01-03 12:20:30 +08:00
Gary Ching-Pang Lin
92a136d823 Add support for deleting specific keys 2013-01-03 12:20:22 +08:00
Gary Ching-Pang Lin
990dcdb6a6 Add support for deleting specific keys 2013-01-03 12:20:22 +08:00
Gary Ching-Pang Lin
a05c7c57d9 MOK doesn't include the signature owner 2012-12-27 11:42:54 +08:00
Gary Ching-Pang Lin
0c6a8a7501 MOK doesn't include the signature owner 2012-12-27 11:42:54 +08:00
Gary Ching-Pang Lin
262d671419 Add a general function for password matching 2012-12-27 11:42:54 +08:00
Gary Ching-Pang Lin
5abe73ab81 Add a general function for password matching 2012-12-27 11:42:54 +08:00
Gary Ching-Pang Lin
a64ab2ec6b Reboot the system after enrolling/erasing keys 2012-12-27 11:42:45 +08:00
Gary Ching-Pang Lin
510dafda53 Reboot the system after enrolling/erasing keys 2012-12-27 11:42:45 +08:00
Gary Ching-Pang Lin
4895ca3919 Clear the screen before erasing keys 2012-12-20 12:55:59 +08:00
Gary Ching-Pang Lin
10f0f58b03 Clear the screen before erasing keys 2012-12-20 12:55:59 +08:00
Steve Langasek
0bab096d4b Add a versioned build-dependency on gnu-efi; we need features only found
in 3.0k to build the netboot support.
2012-12-13 18:43:13 -08:00
Steve Langasek
c37196e746 debian/patches/sbsigntool-not-pesign: Sign MokManager with
sbsigntool instead of pesign.
2012-12-13 18:42:34 -08:00
Steve Langasek
0565508e53 Import new upstream snapshot 2012-12-13 00:44:23 +00:00
Steve Langasek
7f61250830 Import upstream version 0~20120906.bcd0a4e8+bzr106 2012-12-12 16:36:10 -08:00
Gary Ching-Pang Lin
09e2c93956 Get the second stage loader from the Load Options
This commit replaces the 2nd stage loader path with the first
argument in the Load Options and moves the rest arguments (if any)
to the Load Options for the 2nd stage loader.

For example, to make shim to load elilo.efi, just create a new
boot entry with efibootmgr:

 # efibootmgr -c -L "shim elilo" -l "efi\\shim.efi" -u "elilo.efi"
2012-12-10 16:34:35 +08:00
Gary Ching-Pang Lin
14d4b8e5ca Get the second stage loader from the Load Options
This commit replaces the 2nd stage loader path with the first
argument in the Load Options and moves the rest arguments (if any)
to the Load Options for the 2nd stage loader.

For example, to make shim to load elilo.efi, just create a new
boot entry with efibootmgr:

 # efibootmgr -c -L "shim elilo" -l "efi\\shim.efi" -u "elilo.efi"
2012-12-10 16:34:35 +08:00
Matthew Garrett
8d311bc7e7 Remove debug code
secure_mode() was altered to always return true for debug purposes, and this
accidentally got committed to mainline. Fix that.
2012-11-27 23:52:27 -05:00
Matthew Garrett
9c0c64ebde Remove debug code
secure_mode() was altered to always return true for debug purposes, and this
accidentally got committed to mainline. Fix that.
2012-11-27 23:52:27 -05:00
Matthew Garrett
ef8c9962a8 Sign MokManager with a locally-generated key
shim needs to verify that MokManager hasn't been modified, but we want to
be able to support configurations where shim is shipped without a vendor
certificate. This patch adds support for generating a certificate at build
time, incorporating the public half into shim and signing MokManager with
the private half. It uses pesign and nss, but still requires openssl for
key generation. Anyone using sbsign will need to figure this out for
themselves.
2012-11-26 13:43:50 -05:00
Matthew Garrett
6d50f87a06 Sign MokManager with a locally-generated key
shim needs to verify that MokManager hasn't been modified, but we want to
be able to support configurations where shim is shipped without a vendor
certificate. This patch adds support for generating a certificate at build
time, incorporating the public half into shim and signing MokManager with
the private half. It uses pesign and nss, but still requires openssl for
key generation. Anyone using sbsign will need to figure this out for
themselves.
2012-11-26 13:43:50 -05:00
Matthew Garrett
e4d55afe6a Don't fail if there's no network devices
findNetboot() would continue blindly even if no PXE-capable devices were
found. Fix that.
2012-11-01 16:03:24 -04:00
Matthew Garrett
2fd180a92d Don't fail if there's no network devices
findNetboot() would continue blindly even if no PXE-capable devices were
found. Fix that.
2012-11-01 16:03:24 -04:00
Matthew Garrett
064c0eed5f Bump version
This seems pretty much functionally complete, so let's call it 0.2.
2012-11-01 15:32:12 -04:00
Matthew Garrett
5c9cf018c7 Bump version
This seems pretty much functionally complete, so let's call it 0.2.
2012-11-01 15:32:12 -04:00
Matthew Garrett
4ad234f175 Merge branch 'mok' into netboot
Conflicts:
	shim.c
2012-11-01 15:29:23 -04:00
Matthew Garrett
821eca49e9 Merge branch 'mok' into netboot
Conflicts:
	shim.c
2012-11-01 15:29:23 -04:00
Matthew Garrett
20f6cde679 Add comments 2012-11-01 15:26:36 -04:00
Matthew Garrett
0aee67a800 Add comments 2012-11-01 15:26:36 -04:00
Matthew Garrett
28a3e57c9a Merge branch 'mok' into netboot
Conflicts:
	Makefile
	shim.c
2012-11-01 10:45:22 -04:00
Matthew Garrett
5c9470f288 Merge branch 'mok' into netboot
Conflicts:
	Makefile
	shim.c
2012-11-01 10:45:22 -04:00
Matthew Garrett
201574d1be Fix AuthenticodeVerify loop
Cert needs to be modified inside the Index loop, not outside it. This is unlikely to
ever trigger since there will typically only be one X509 certificate per
EFI_SIGNATURE_LIST, but fix it anyway.
2012-11-01 10:39:31 -04:00
Matthew Garrett
cb385f1937 Fix AuthenticodeVerify loop
Cert needs to be modified inside the Index loop, not outside it. This is unlikely to
ever trigger since there will typically only be one X509 certificate per
EFI_SIGNATURE_LIST, but fix it anyway.
2012-11-01 10:39:31 -04:00
Matthew Garrett
058c0368ad Fix signature checking
We could potentially find a valid signature and then fail to validate it
due to not breaking out of the outer while loop.
2012-11-01 10:31:14 -04:00
Matthew Garrett
7a47160208 Fix signature checking
We could potentially find a valid signature and then fail to validate it
due to not breaking out of the outer while loop.
2012-11-01 10:31:14 -04:00
Matthew Garrett
6f16162653 Fix double free
load_image() didn't allocate PathName, don't have it free it.
2012-11-01 10:12:20 -04:00
Matthew Garrett
53feaa0152 Fix double free
load_image() didn't allocate PathName, don't have it free it.
2012-11-01 10:12:20 -04:00
Matthew Garrett
ed711b02ec Fix up some types
Type-checking the UEFI calls picked up a couple of problems. Fix them up.
2012-11-01 09:46:51 -04:00
Matthew Garrett
24a602b614 Fix up some types
Type-checking the UEFI calls picked up a couple of problems. Fix them up.
2012-11-01 09:46:51 -04:00
Matthew Garrett
5a8d573fb1 Add documentation of the Mok variables
Brief overview of the function and format of the various variables used
by Shim and MokManager.
2012-10-30 16:14:02 -04:00
Matthew Garrett
da1e6d751b Add documentation of the Mok variables
Brief overview of the function and format of the various variables used
by Shim and MokManager.
2012-10-30 16:14:02 -04:00
Matthew Garrett
0a0cd6ba77 Merge branch 'mok' of github.com:mjg59/shim into mok 2012-10-30 15:59:40 -04:00
Matthew Garrett
4f54460442 Merge branch 'mok' of github.com:mjg59/shim into mok 2012-10-30 15:59:40 -04:00
Gary Ching-Pang Lin
8b7685b212 Check the vendor blacklist correctly 2012-10-30 10:35:36 -04:00
Gary Ching-Pang Lin
054dc6d29e Check the vendor blacklist correctly 2012-10-30 10:35:36 -04:00
Gary Ching-Pang Lin
ba00aadb45 Initialize the size of vendor dbx as 0
The size of vendor dbx must be 0 if there is no vendor dbx provided
or the functions of db check will crash.
2012-10-30 10:35:36 -04:00
Gary Ching-Pang Lin
6fc35f2eaa Initialize the size of vendor dbx as 0
The size of vendor dbx must be 0 if there is no vendor dbx provided
or the functions of db check will crash.
2012-10-30 10:35:36 -04:00
Matthew Garrett
d77f421bcc 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.
2012-10-24 01:14:50 -04:00
Matthew Garrett
0e3ff89ac7 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.
2012-10-24 01:14:50 -04:00
Matthew Garrett
8a1690683f Improve signature validation enable/disable
The logic used in checking the signature validation password was a bit
ugly. Improve that so it behaves rather more as expected.
2012-10-24 01:05:45 -04:00