Commit Graph

508 Commits

Author SHA1 Message Date
Peter Jones
0470d800d5 MokManager: Fix a -Wsign-compare bug on i?86
My favorite part of -Wsign-compare is how it shows different results on
different arches for no obvious reason.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-11-17 11:39:21 -05:00
Peter Jones
82e8358fa1 Fix unsigned int overflow on our i386 debug hook test.
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-11-17 11:39:16 -05:00
Gary Ching-Pang Lin
775fdb9f4f Cryptlib: Define the va functions for EFIAPI
It turned out that my previous crash fix(*) was wrong.
We actually always used the gcc built-in va functions instead of
the "real" va functions for EFIAPI, and we are just lucky that
ERR_add_error_data didn't crash before.

This commit copies the va functions from MdePkg/Include/Base.h
in edk2 and introdues NO_BUILTIN_VA_FUNCS for x86_64, so that all
the x86_64 build will adopt the new va functions. For safety,
I also added EFIAPI to all the functions which use va_* to avoid
the potential trouble.

(*) a7f4b26cc3

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-11-09 09:50:50 -05:00
Linn Crosetto
11a4d912bd Fix recursive reference for RELEASE
Building 0.9 with GNU Make 4.0 fails with the following error:

Makefile:4: *** Recursive variable 'RELEASE' references itself (eventually).  Stop.

Change RELEASE to simply-expanded.

Signed-off-by: Linn Crosetto <linn@hpe.com>
2015-09-18 14:49:34 -04:00
Gary Ching-Pang Lin
a4af142590 Specify the gnu89 standard
According to the gcc5 porting guideline (*), gcc5 defaults to
-std=gnu11 instead of -std=gnu89. Append -std=gnu89 to CFLAGS
to avoid the potential problems.

(*) https://gcc.gnu.org/gcc-5/porting_to.html

Based on the patch from Cristian Rodriguez <crrodriguez@opensuse.org>

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-07-28 11:46:38 -04:00
Gary Ching-Pang Lin
63b1c7e07e Openssl: Add EFIAPI for ERR_add_error_vdata
Without declaring EFIAPI for ERR_add_error_vdata, shim would crash
while verifying the loaded image.

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-07-28 11:46:38 -04:00
Gary Ching-Pang Lin
5ce38c90cf Update openssl to 1.0.2d
Also update Cryptlib to edk2 r17731

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-07-28 11:46:38 -04:00
Peter Jones
69ba24ff72 Typo on aarch64 :/
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-30 14:54:43 -04:00
Peter Jones
a16796b99c 0.9
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-30 14:20:12 -04:00
Peter Jones
403afdad02 Improve our debuginfo path print
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-30 14:19:57 -04:00
Peter Jones
b4cd19405f Make sure our build-id notes wind up at a reasonable place.
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-29 20:03:36 -04:00
Peter Jones
c55b17d281 Only be verbose the first time secure_mode() is called.
It's annoying to find out we're not in SB mode over and over.  Really it
is.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-29 14:41:21 -04:00
Peter Jones
fef725de4d Add a conditional point for a debugger to attach.
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-29 14:41:21 -04:00
Peter Jones
15b5aae395 More incorrect unsigned vs signed fixups from yours truly.
Woops.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-29 14:41:21 -04:00
Peter Jones
c41efe5a8c Don't print anything or delay when start_image() succeeds.
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-29 14:41:21 -04:00
Peter Jones
dcfd6b68be MokManager: Nerf SHA-1 again for actual hashes and signatures.
Nobody should be deploying SHA-1.  No hardware deploys it, and the rate
of change on https://en.wikipedia.org/wiki/SHA-1#Attacks is wildly
uninspiring.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-16 11:46:14 -04:00
Gary Ching-Pang Lin
91ef3c4b67 MokManager: fix comparison between signed and unsigned integer
Patch from Johannes Segitz <jsegitz@suse.com>
2015-06-16 11:46:14 -04:00
Gary Ching-Pang Lin
e9afe1f9d3 MokManager: Discard the list contains an invalid signature
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:46:14 -04:00
Gary Ching-Pang Lin
5a778db50b MokManager: Support SHA224, SHA384, and SHA512
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:46:14 -04:00
Gary Ching-Pang Lin
60b59afb7e MokManager: Add more key list safe checks
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:46:14 -04:00
Gary Ching-Pang Lin
0402903011 MokManager: fix the return value and type
There are some functions that the return value and the type
didn't match.

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
2ad3a95ef0 MokManager: Support SHA1 hash in MOK
Add SHA1 hash support and amend the code to make it easier to support
other SHA digests.
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
38df5caad3 MokManager: fix the hash list counting in delete
match_hash() requests the number of keys in a list and it was
mistakenly replaced with the size of the Mok node. This would
made MokManager to remove the whole Mok node instead of one
hash.

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
607d370c2f MokManager: calculate the variable size correctly
MokSize of the hash signature list includes the owner GUID,
so we should not add the 16bytes compensation.

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
c9b0c3520c Make shim to check MokXAuth for MOKX reset
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
894c0b99dc Verify the EFI images with MOK blacklist
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
ed8363efd2 Copy the MOK blacklist to a RT variable
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
c9cf07a0e0 MokManager: Write the hash list properly
also return to the previous entry in the list

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
c9261eab2a MokManager: Match all hashes in the list
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
7659efe09d MokManager: delete the hash properly
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
8d7e85a289 MokManager: show the hash list properly
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Gary Ching-Pang Lin
10a2161a90 Support MOK blacklist
The new blacklist, MokListX, stores the keys and hashes that are
banned.

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-06-16 11:41:32 -04:00
Peter Jones
1fefa29c34 Fix console_print_box*() parameters.
When we made lib build with the correct CFLAGS, it inherited
-Werror=sign-compare, and I fixed up some parameters on
console_print_box() and console_print_box_at() to avoid sign comparison
errors.

The fixups were *completely wrong*, as some behavior relies on negative
values.  So this fixes them in a completely different way, by casting
appropriately to signed types where we're doing comparisons.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-16 11:41:32 -04:00
Peter Jones
0a7003faec Ensure that apps launched by shim get correct BS->Exit() behavior
Right now applications run by shim get our wrapper for Exit(), but it
doesn't do as much cleanup as it should - shim itself also exits, but
currently is not doing all the cleanup it should be doing.

This changes it so all of shim's cleanup is also performed.

Based on a patch and lots of review from Gary Lin.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-11 13:25:56 -04:00
Peter Jones
b9f98904ba Don't leave in_protocol==1 when shim_verify() isn't enforcing.
Right now if shim_verify() sees secure_mode()==0, it exits with
EFI_SUCCESS, but accidentally leaves in_protocol=1.  This means any
other call will have supressed error/warning messages.

That's wrong, so don't do it.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-11 13:20:09 -04:00
Peter Jones
8837b9054f Only run MokManager if asked or a security violation occurs.
Don't run MokManager on any random error from start_image(second_stage);
only try it if it /is/ the second stage, or if start_image gave us
EFI_SECURITY_VIOLATION.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-06-04 10:19:30 -04:00
Mathieu Trudel-Lapierre
c2f285a93f More GCC 5 fixes: stdarg.h and other include tweaks, cherry-pick from
d51739a4.
2015-05-12 21:51:24 -04:00
Mathieu Trudel-Lapierre
d6f876b850 Fix build with GCC 5, forcing -std=gnu89 to not rely on stdint.h
required by efibind.h, and not found with -nostdinc. (LP: #1429978)
2015-05-12 21:48:09 -04:00
Gary Ching-Pang Lin
80bcb57823 Make the build failed with objcopy < 2.24
The wildcard support was introduced in objcopy since binutils 2.24.
However, objcopy < 2.24 never issues any warning message with the
wildcard and a faulty binary will be generated. This commit makes
the build failed as a notification for the usage of binutils < 2.24.

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-05-12 13:52:22 -04:00
Gary Ching-Pang Lin
f3653b08a4 Update Cryptlib and openssl
Update Cryptlib to r16559 and openssl to 0.9.8zf

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-05-12 13:51:02 -04:00
Steve Langasek
8fa98d6dcd releasing package shim version 0.8-0ubuntu2 2015-05-12 17:48:34 +00:00
Mathieu Trudel-Lapierre
acd2cc1e4f * New upstream release.
- Clarify meaning of insecure_mode. (LP: #1384973)
* debian/patches/CVE-2014-3675.patch, debian/patches/CVE-2014-3677.patch,
  debian/patches/0001-Update-openssl-to-0.9.8za.patch: dropped, included
  in the upstream release.
* debian/patches/sbsigntool-not-pesign,debian/patches/second-stage-path:
  refreshed.
2015-05-11 19:50:49 -04:00
Mathieu Trudel-Lapierre
86a08c30b4 Reapplying all patches 2015-05-10 10:03:20 -04:00
Mathieu Trudel-Lapierre
37358ddb1c Add bug tag for insecure_mode semantics changes in 0.8. 2015-05-07 16:03:19 -04:00
Mathieu Trudel-Lapierre
28da53af72 debian/patches/sbsigntool-not-pesign,debian/patches/second-stage-path:
refreshed.
2015-05-06 14:02:40 -04:00
Mathieu Trudel-Lapierre
e42efbd92b debian/patches/CVE-2014-3675.patch, debian/patches/CVE-2014-3677.patch,
debian/patches/0001-Update-openssl-to-0.9.8za.patch: dropped, included
in the upstream release.
2015-05-06 14:01:16 -04:00
Mathieu Trudel-Lapierre
4c03444e7c New upstream release. 2015-05-06 09:50:11 -04:00
Mathieu Trudel-Lapierre
a14921c594 Import upstream version 0.8 2015-05-06 09:49:41 -04:00
Mathieu Trudel-Lapierre
2283f5e85d Unapplying patches to prevent spurious conflicts. 2015-05-06 09:49:30 -04:00
Steve Langasek
3967dc6524 Merge upstream git branch for release 0.7 2015-05-05 23:32:33 +00:00