Commit Graph

512 Commits

Author SHA1 Message Date
Mathieu Trudel-Lapierre
31e25d5271 Updated version 12+1502324945.478f9bb from 'upstream/12+1502324945.478f9bb'
with Debian dir a5373f8bb4
2017-08-09 20:39:01 -04:00
Mathieu Trudel-Lapierre
ac05ece820 New upstream version 12+1502324945.478f9bb 2017-08-09 20:39:01 -04:00
Mathieu Trudel-Lapierre
33da8726b4 Fix typo for DEFAULT_LOADER: missing a backslash, also needs quoting. 2017-08-07 17:43:53 -04:00
Mathieu Trudel-Lapierre
5ca483b97b debian/patches/0001-shim-fix-the-mirroring-MokSBState-fail.patch: dropped, included upstream. 2017-08-07 17:43:08 -04:00
Mathieu Trudel-Lapierre
5d42729fe3 Define an EFI_ARCH variable, and use that for paths to shim. This makes it possible to build a shim for other architectures than amd64. 2017-08-07 17:42:42 -04:00
Mathieu Trudel-Lapierre
ea54c7675f debian/patches/sbsigntool-no-pesign: refreshed. 2017-08-07 17:42:12 -04:00
Mathieu Trudel-Lapierre
94190a1cd8 Set DEFAULT_LOADER; this makes second-stage-path unnecessary. 2017-08-07 17:39:45 -04:00
Mathieu Trudel-Lapierre
62a4fa2d31 * debian/rules:
- Update dh_auto_build/dh_auto_clean for new upstream options: set
    MAKELEVEL.
2017-08-07 17:39:07 -04:00
Mathieu Trudel-Lapierre
ba899c3d3c debian/control: add a Build-Depends on libnss3-tools for pk12-util. 2017-08-07 17:38:30 -04:00
Mathieu Trudel-Lapierre
11c5b79d30 New upstream snapshot: 12+1501864225.b586175. 2017-08-07 17:37:56 -04:00
Mathieu Trudel-Lapierre
25f7fd1fb3 New upstream version 12+1501864225.b586175 2017-08-07 17:35:43 -04:00
Mathieu Trudel-Lapierre
cd6457d07d Merge tag 'upstream/12+1501864225.b586175' into cyphermox/mokmanager
Upstream version 12+1501864225.b586175
2017-08-07 17:35:43 -04:00
Mathieu Trudel-Lapierre
f4173af1ad New upstream version 12+1501864225.b586175 2017-08-07 17:34:45 -04:00
Mathieu Trudel-Lapierre
f51c03c05b Merge branch 'master' into cyphermox/mokmanager
Update changelog entries/changes from Debian for 0.9+1474479173.6c180c6-1.
2017-08-07 17:28:51 -04:00
Mathieu Trudel-Lapierre
bd98c8fd1c Update changelog/changes for released 0.9+1474479173.6c180c6-1ubuntu1 2017-08-07 17:24:36 -04:00
Mathieu Trudel-Lapierre
3b43f33d71 Update changelog for released 0.9+1474479173.6c180c6-0ubuntu1 2017-08-07 17:21:03 -04:00
Julien Cristau
19d90b863d More debian/copyright tweaks 2016-10-15 15:30:50 +02:00
Julien Cristau
ce5a310ea0 Add some missing copyright holders in d/copyright, update Upstream-Contact. 2016-10-13 09:07:31 +02:00
Steve Langasek
2f799ca922 releasing package shim version 0.9+1474479173.6c180c6-1 2016-10-01 21:36:33 -07:00
Steve Langasek
23085e3f4c fix path we're chmodding, for current upstream 2016-10-01 23:20:55 +00:00
Steve Langasek
b65e78ec01 Resync with Ubuntu, including patch to fix debian/copyright. 2016-10-01 14:18:49 -07:00
Steve Langasek
21ebe03556 * Initial Debian upload. Closes: #820052.
* Update Standards-Version.
* Embed the newly-minted Debian CA certificate.
* Vendorize debian/rules so that the same package can be used in both
  Debian and Ubuntu without modification.
* Fix debian/copyright to match the spec (last match wins, not first)
* Fix shim.efi to not be executable.
* Add watchfile.
* Support parallel builds, because eh why not
* Update Vcs-Bzr.
2016-10-01 13:11:17 -07:00
Mathieu Trudel-Lapierre
86b44a70f0 debian/shim.install: built EFI binaries were renamed; update our install
file to properly pick up shim (shim$arch), MokManager (mm$arch), and
fallback (fb$arch).
2016-09-22 10:26:38 -04:00
Mathieu Trudel-Lapierre
c2463d3878 * debian/patches/unused-variable: dropped; applied upstream.
* debian/patches/binutils-version-matching: dropped, fixed upstream.
2016-09-22 10:24:56 -04:00
Mathieu Trudel-Lapierre
5998f019f8 New upstream release. 2016-09-22 10:15:26 -04:00
Mathieu Trudel-Lapierre
62f0afa2ec Import upstream version 0.9+1474479173.6c180c6 2016-09-21 20:29:42 -04:00
Helen Koike
e3ef28acdf [ Helen Koike ]
* debian/copyright: add OpenSSL license 
[ Mathieu Trudel-Lapierre ]
* debian/copyright: patches should be BSD, like the rest of the upstream
  code.
2016-09-20 09:47:26 -04:00
Steve Langasek
dd00e8761d Merge git into history 2016-09-19 15:42:43 -07:00
Steve Langasek
d7e4fd12a1 Merging shared upstream rev into target branch. 2016-09-19 15:36:28 -07:00
Steve Langasek
6b1d02e112 Prepared upstream tree for merging into target branch. 2016-09-19 15:36:28 -07:00
Steve Langasek
6af9d134b8 New upstream release (fix-up commit) 2016-09-19 15:36:20 -07:00
Steve Langasek
1442bd7097 Import upstream version 0.9+1465500757.14a5905 2016-09-19 15:07:08 -07:00
Helen Koike
879d307f86 debian/copyright: add OpenSSL license 2016-09-15 11:22:31 -03:00
Mathieu Trudel-Lapierre
cffaa5078d releasing package shim version 0.9+1465500757.14a5905-0ubuntu1 2016-07-26 16:49:50 -04:00
Mathieu Trudel-Lapierre
9fa1d28f0d debian/copyright: update copyright for patches. 2016-07-26 16:48:29 -04:00
Mathieu Trudel-Lapierre
7fbc200d47 * debian/patches/unused-variable: remove unused variable size.
* debian/patches/binutils-version-matching: revert d9a4c912 to correctly
  match objcopy's version on Ubuntu.
2016-07-26 14:37:29 -04:00
Mathieu Trudel-Lapierre
d191cf2c9e Update bug tags for closed bugs upstream. 2016-07-26 13:48:37 -04:00
Mathieu Trudel-Lapierre
beb4623938 Apply patches again 2016-07-26 13:31:49 -04:00
Mathieu Trudel-Lapierre
110c669fd6 * Refreshed patches.
- Remaining patches:
    + second-stage-path
    + sbsigntool-not-pesign
2016-07-26 12:20:13 -04:00
Mathieu Trudel-Lapierre
1854cb28d1 New upstream release. 2016-07-26 12:03:25 -04:00
Mathieu Trudel-Lapierre
d3819813b8 Import upstream version 0.9+1465500757.14a5905 2016-07-26 12:02:18 -04:00
Peter Jones
a8b6d058f0 shim: make the PE loader less overzealous on rejections 2016-06-09 15:32:37 -04:00
Peter Jones
08ede98fbc Work around binutils version string weirdness.
Nick Clifton wrote to me and explained:

Subject: SHIM - objcopy version check broken by RHEL 7.3 binutils
Hi Peter,

  We (the tools group) have run across a small problem with the shim
  package for RHEL 7.3, whilst testing out a new version of the
  binutils.  It complains that it needs a version of objcopy that is
  >= 2.23, despite the fact that the version is actually 2.25.1.

  I tracked the problem down to an extraneous space at the end of the
  version string being produced by objcopy:

    "GNU objcopy version 2.25.1-8.el7 "

  The Makefile in the shim package uses this rule to test the version of
  objcopy:

    OBJCOPY_GTE224  = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^.* //g' | cut -f1-2 -d.` \>= 2.24)

  But, because of that extra space, the sed expression clips the entire
  line and so the test fails.

  The extra space is there because normally the version number would be
  followed by a date.  For example:

    "GNU objcopy version 2.23.52.0.1-56.el7 20130226"

  So in this case the sed will extract the date, not the version number,
  but the test will still pass.

  I could fix the binutils to remove the space, although it would be a
  bit messy and it would not fix the problem when a date is appended to
  the version number.  Instead, I would like to propose a small patch to
  the shim Makefile.  If you change the line to:

    OBJCOPY_GTE224  = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^.version //g' | cut -f1-2 -d.` \>= 2.24)

  then the test will work as intended, with or without an extra space at
  the end of the version and with or without a date appended.

  Would it be possible to have this change added to the shim package ?

Cheers

Signed-off-by: Peter Jones <pjones@redhat.com>
2016-05-18 10:33:38 -04:00
Matthew Garrett
964f56b310 Measure state and second stage into TPM
Add support for measuring the MOK database and secure boot state into a
TPM, and do the same for the second stage loader. This avoids a hole in
TPM measurement between the firmware and the second stage loader.
2016-05-11 11:11:05 -04:00
Ivan Hu
dd66e12d73 shim: dealing with only one string on loadoption
The second stage set is not working after commit
3322257e61 for those which load option
only have one string.

Signed-off-by: Ivan Hu <ivan.hu@canonical.com>
2016-05-11 11:10:17 -04:00
Mathieu Trudel-Lapierre
e9f7a5148b shim: mirror MokSBState in runtime so the kernel can make use of it.
Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
2016-03-22 11:14:31 -04:00
Peter Jones
000261ca88 Don't test for the 0 character on the wrong half of the UCS2-LE char.
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-11-17 11:41:12 -05:00
Peter Jones
4d70bbd894 shim: check for EFI\BOOT\BOOT${ARCH}.EFI as well as the leading \ version
I found a machine whose BDS gives us relative paths, yay!  The rest of
the code still works without that leading slash, so just make it one
more item we let through our StrnCaseCmp() filter.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-11-17 11:40:29 -05:00
Peter Jones
b7e59fd987 shim: fix resource leak on should_use_fallback() error path
ExitBootServices() and Exit() should both clean these up anyway, but we
should do the right thing nonetheless.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-11-17 11:40:23 -05:00
Peter Jones
d4fee90cdc shim: rebuild shim.o if headers change
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-11-17 11:40:09 -05:00