Commit Graph

1510 Commits

Author SHA1 Message Date
Steve McIntyre
c161c40d1e Typo fix 2020-07-24 01:28:51 +01:00
Mario Limonciello
eff62a79f3 Merge branch 'lintian-fixes' into 'master'
Fix some issues reported by lintian

See merge request efi-team/shim!5
2020-06-12 18:45:50 +00:00
Debian Janitor
434300fcc7
Update standards version to 4.4.1, no changes needed.
Fixes: lintian: out-of-date-standards-version
See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html
2020-04-01 06:41:16 +00:00
Debian Janitor
90f64daec9
Set upstream metadata fields: Bug-Database, Bug-Submit.
Fixes: lintian: upstream-metadata-file-is-missing
See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html
2020-04-01 06:40:47 +00:00
Debian Janitor
7d69650c4c
Set debhelper-compat version in Build-Depends.
Fixes: lintian: uses-debhelper-compat-file
See-also: https://lintian.debian.org/tags/uses-debhelper-compat-file.html
2020-04-01 06:40:13 +00:00
Debian Janitor
6ce7b6e059
Bump debhelper from old 11 to 12.
Fixes: lintian: package-uses-old-debhelper-compat-version
See-also: https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html
2020-04-01 06:39:44 +00:00
Debian Janitor
e1df2a1d87
debian/copyright: use spaces rather than tabs to start continuation lines.
Fixes: lintian: tab-in-license-text
See-also: https://lintian.debian.org/tags/tab-in-license-text.html
2020-04-01 06:39:14 +00:00
Debian Janitor
1a8bb34c7e
Use secure copyright file specification URI.
Fixes: lintian: insecure-copyright-format-uri
See-also: https://lintian.debian.org/tags/insecure-copyright-format-uri.html
2020-04-01 06:38:44 +00:00
Debian Janitor
69a55e2416
Trim trailing whitespace.
Fixes: lintian: file-contains-trailing-whitespace
See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html
2020-04-01 06:38:15 +00:00
Steve McIntyre
a7788a2134 Tweak the version dependency of the -helpers-ARCH-signed packages
Change the version dependency on shim-unsigned to be >= and not =.
This will allow for installation to still work in the window while we
wait for the template package to do its second trip through the
archive. Closes: #955356
2020-03-30 15:22:35 +01:00
Steve McIntyre
c90bfe2dfd Ignore debian/files 2020-03-30 15:05:57 +01:00
Steve McIntyre
8e0de2bdaf Prepare Debian release 15+1533136590.3beb971-8 2020-03-24 17:49:45 +00:00
Steve McIntyre
f320bcacd5 Update debhelper compat level to 11 2020-03-24 17:47:56 +00:00
Steve McIntyre
10b051f346 Switch to using gcc-9 for builds. Closes: #925826
Pull upstream commit aaa09b35e73c4a35fc119d225e5241199d7cf5aa to fix
an FTBFS.
2020-03-24 17:38:57 +00:00
Steve McIntyre
3a1cdbfd4c Use --padding when calling pesign to generate hashes
for the dbx list, as recommended by Peter Jones. No actual changes
needed in our list of hashes at this point - they work out the same
either way.
2019-05-08 16:49:11 +01:00
Steve McIntyre
ee2d7bb94f Prepare Debian release 15+1533136590.3beb971-7 2019-05-08 02:06:02 +01:00
Steve McIntyre
ea8f00b9bf Remove the hash for Sledge's test arm64 grub binary
Not needed now.
2019-05-08 02:03:37 +01:00
Steve McIntyre
28e8f71ef2 Add an empty list of hashes for the Ubuntu build
so they'll get an empty dbs list rather than breaking the build
2019-05-07 11:05:48 +01:00
dann frazier
81dc204854 Output efisiglist commands to the build log
It wouldn't hurt to keep a record of them.
2019-05-06 13:56:20 -06:00
dann frazier
a42739719f Require dbx hashes
While it maybe convenient for a developer to be able to do a build
w/o any dbx hashes, it prevents the $(DBX_LIST) target from having
a proper dependency on the $(DBX_HASHES) file. If a developer were
to add a new hash in a built tree, make would not detect that on
a subsequent build and would not update the $(DBX_LIST) file.

Continue to support a NULL $(DBX_LIST) build by touching the
$(DBX_LIST) file in case no efisiglist commands ran. Developers
can now create an empty $(DBX_HASHES) file to get that.
2019-05-06 13:50:24 -06:00
dann frazier
99990d2175 Use $@ instead of referencing ${DBX_LIST} in multiple places 2019-05-06 13:33:20 -06:00
dann frazier
cdceb0fb38 'set -e' the code that generates the dbx list
Without this we would silently ignore an efisiglist command error.
2019-05-06 13:30:17 -06:00
dann frazier
55d5545782 Remove unnecessary exports 2019-05-06 13:29:30 -06:00
Steve McIntyre
cd18644209 Merge branch 'hack' from 93sam
Changes:

 crash fixes
 generate dbx file at runtime
2019-05-06 13:14:28 +01:00
Steve McIntyre
549f650b3d Add more hashes that we want to blacklist
signed arm64 grub binaries that allow use of the devicetree command,
as found in

 grub-efi-arm64-signed_1+2.02+dfsg1+16_arm64.deb
 grub-efi-arm64-signed_1+2.02+dfsg1+17_arm64.deb
2019-05-06 13:07:00 +01:00
Steve McIntyre
88a7a6505b Add initial file with test checksums for the dbx list 2019-05-06 13:00:19 +01:00
Steve McIntyre
6cf246a5c9 Generate a vendor dbx file at build time
This allow us to block executing binaries with specific
checksums. Generate the dbx list at runtime from a simple list of
sha256 hashes, so we can update this easily. If we need to also
blacklist a cert later, we'll need to update this code to add that
option too.

Add a build-dep on pesign to get the needed efisiglist program.
2019-05-04 18:56:30 +01:00
Steve McIntyre
e17b0af466 Build using gcc-7
To get better control of reproducibility during the lifetime of
Buster
2019-05-03 01:25:06 +00:00
Steve McIntyre
839af42e06 Update VCS-* fields in debian/control 2019-05-03 01:25:04 +00:00
Steve McIntyre
315e87677b Fix OBJ_create() to tolerate a NULL sn and ln
Cherry-picked fix from upstream MR at
3a9e237b1b

From: f13615c5b8

Apply an upstream patch from OpenSSL to tolerate a NULL sn. This
avoids a NULL pointer reference in shim.c:verify_eku(). This was
discovered because it causes a crash on ARM where, unlike x86, it does
not necessarily have memory mapped at 0x0.

Fixes: 6c180c6004 ("shim: verify Extended Key Usage flags")
Signed-off-by: dann frazier <dann.frazier@canonical.com>
2019-05-03 01:25:01 +00:00
Steve McIntyre
878d860c31 VLogError(): Avoid NULL pointer dereferences in (V)Sprint calls
Backport of upstream fix:

VLogError() calculates the size of format strings by using calls to
SPrint and VSPrint with a StrSize of 0 and NULL for an output
buffer. Unfortunately, this is an incorrect usage of (V)Sprint. A
StrSize of "0" is special-cased to mean "there is no limit". So, we
end up writing our string to address 0x0. This was discovered because
it causes a crash on ARM where, unlike x86, it does not necessarily
have memory mapped at 0x0.

Avoid the (V)Sprint calls altogether by using (V)PoolPrint, which
handles the size calculation and allocation for us.

Signed-off-by: Peter Jones <pjones@redhat.com>
Fixes: 25f6fd08cd ("try to show errors more usefully.")
[dannf: commit message ]
Signed-off-by: dann frazier <dann.frazier@canonical.com>
2019-05-03 01:24:56 +00:00
Steve McIntyre
8036ee26a1 Merge branch 'update-vcs-fields' into 'master'
debian/control: Update Vcs-* fields

See merge request efi-team/shim!4
2019-03-25 10:51:40 +00:00
Ansgar Burchardt
9987936665 debian/control: Update Vcs-* fields 2019-03-25 07:49:52 +01:00
Steve McIntyre
cb7c0af03e Prepare Debian release 15+1533136590.3beb971-6 2019-03-23 19:04:38 +00:00
Helmut Grohne
aa19fc4d38 Fix FTCBFS: Set CROSS_COMPILE. (Closes: #922152) 2019-03-23 19:00:59 +00:00
Steve McIntyre
6bb3165209 Add Provides: and Breaks: to shim-helpers-$arch-signed
to fix clashes with the old shim-signed package for fbx64.efi.signed
and mmx64.efi.signed. Closes: #924619
2019-03-23 18:58:54 +00:00
Steve McIntyre
6a35a720a6 Prepare Debian release 15+1533136590.3beb971-5 2019-03-12 01:38:52 +00:00
Steve McIntyre
14b8b20ebd Remove Rules-Requires-Root in the signing template.
We manually install things owned by root. There might be better ways
to do this, but this will do for now.
2019-03-12 01:37:40 +00:00
Steve McIntyre
424d859ce1 Add changelog entry for Ansgar's fix in 196119a5 2019-03-12 01:30:40 +00:00
Steve McIntyre
1341faba13 Merge branch 'correct-maintainer-address' into 'master'
Correct maintainer address in signing template

See merge request efi-team/shim!3
2019-03-12 01:25:18 +00:00
Ansgar Burchardt
196119a594 Correct maintainer address in signing template 2019-03-11 22:53:44 +01:00
Steve McIntyre
208bd43be2 Prepare Debian release 15+1533136590.3beb971-4
Force a no-change rebuild on all arches with a source-only upload
2019-03-09 22:27:03 +00:00
Steve McIntyre
b197d74e32 Prepare Debian release 15+1533136590.3beb971-3 2019-03-09 12:45:39 +00:00
Steve McIntyre
90609be3eb Update the signing-template JSON metadata
Move all the data under a new top-level "packages" key
Add an empty "trusted_certs" key - the helper binaries do not do any
further verification with an embedded key.
2019-03-08 22:04:53 +00:00
Steve McIntyre
226ac98674 Merge branch 'rename-helpers' into 'master'
Rename all the packages containg the helper binaries

See merge request efi-team/shim!2
2019-03-07 00:23:52 +00:00
Steve McIntyre
ba30131daf Rename all the packages containg the helper binaries
Remove potential confusion with shim-signed. We will now end up with
shim-helpers-$arch-signed to make it clear that they just contain the
helper binaries (fb.efi and mm.efi)
2019-03-06 22:44:57 +00:00
Steve McIntyre
d71a71f4e7 Change maintenance address to be the EFI team
Add me and vorlon to the Uploaders list
2019-03-06 22:04:49 +00:00
Steve McIntyre
739950c1c7 Typo fix: s,singing,signing,g 2019-03-06 21:56:31 +00:00
Luca Boccassi
51b45b0364 Add uname.patch to avoid architecture variability
Signed-off-by: Luca Boccassi <bluca@debian.org>
2019-02-15 21:50:10 +00:00
Luca Boccassi
9bfbee892e Include /usr/share/dpkg/architecture.mk instead of shelling out. 2019-02-15 21:26:05 +00:00