From 2c0e3cc05f7c6dd00d8b81296722309a7d23dc15 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Wed, 3 Oct 2012 22:45:07 -0700
Subject: [PATCH] Include the Canonical Secure Boot master CA (cert.der) and
 include as cert.h at build time.

---
 .pc/.quilt_patches             |   1 -
 .pc/.quilt_series              |   1 -
 .pc/.version                   |   1 -
 .pc/applied-patches            |   0
 cert.der                       | Bin 0 -> 1080 bytes
 debian/changelog               |   2 ++
 debian/clean                   |   1 +
 debian/rules                   |   8 +++++++-
 debian/source/include-binaries |   1 +
 9 files changed, 11 insertions(+), 4 deletions(-)
 delete mode 100644 .pc/.quilt_patches
 delete mode 100644 .pc/.quilt_series
 delete mode 100644 .pc/.version
 delete mode 100644 .pc/applied-patches
 create mode 100644 cert.der
 create mode 100644 debian/clean
 create mode 100644 debian/source/include-binaries

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/.pc/applied-patches b/.pc/applied-patches
deleted file mode 100644
index e69de29..0000000
diff --git a/cert.der b/cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..b4098d9cd81ea586602804afcf876e6247230081
GIT binary patch
literal 1080
zcmXqLVlgpjVwPFJ%*4pV#L2MJQDuRI&ZKk$UN%mxHjlRNyo`+8tPBQ?Er#3%oNUaY
zENsF|?oNgx20|bX2M@PraZaj2ewu=BVxFOZ0Ut<|orm2ezcf83vDi@DKolgx#lz>E
zn3tcInVguT;8T*KXJ}$z1d?Fp(MFX3np0eoTBP8dT2zvm22@{?s^C~!l96AOSyE{r
zC(dhVWME=wWN2t;WNH{C&T9hVf&hp+Se)6!sDvDVjI0dIO^o~u22G4yOihf84Ev+4
z#7f>N#;!|zJ2!02-h20oKHsg=^-1Dib0F7)L-2fW_wPh`^)rHbH$!bLLtZ;rZ`}Q;
z)ui&&_v-z-s!j;#O4hE8JiqM9OF#Zw>w;eS%$soT*i2r(^wf&jpBJxMczIRzPo7gR
zwYc^6xnJGi4=qyEogLz6DiAK*o3lrgEx@bp)y$O{%dL;IOB>BwAlc4WxjSQ~Zr$Xd
zr{7+moc&Y#?T!r3JvXNYI7A=aRJiJOO!&RRpAKAiqu0o_=mtmyU3>UBJ8wdYfAp5u
z3QrORZbf}~^~C8q<B@-g@;7%L2$|~C7*r(hnNoEkN97|&0k`kc1x6Pa$b_%(eY}2Y
zA1kY!fb&8oW=00a#f{4h8W$VL0+WF(ABz}^$l8fBxesY={3_1Uqr5FOO0CZ%D%n6D
zB(2OMVIbCkT>(ExfiNTEe->5)W*}w24HDpIVF9M-HUno6N1nyTz{<d4f!P9+HlvJ^
zk^(Dz{qpj1y<}LD)Jx9K)h|v>E-gycP0G(N(ai-XLfzy<z2u@C<fsJZ1z=P%GT7IC
zD_gp`d5d<{h1?)1=H??p%LC@PPdam8N_o?zb>W+5vV1kNIu<I+ep_f|*smK`$`oEd
zIUIO<R?M79_7cUnrerOgY0<N!BlqAR%fbsKWn#>BValdgL*1jLWE~G(7V^3Ce;wDP
zIZ0gNjB|<~#BKb$=h{|D!K%8mcFc8Yx1(2_wDbu4AN+8RVemw0Yk^W`@m<dvnHr`P
z__%GKvcXpLtb8BSgAAtr-#^`DYZoydV-Gws>&)A`=NHGmowR%3#lO$q$QuV1v+T1e
z+EB~!gYo~2+S79$WLlQ1x)*kA>{VZ?x8l2fd_(4RyOm#NirhZO%*UN}L?(Cd4)yYb
MPE+>&$>Q1r029B9o&W#<

literal 0
HcmV?d00001

diff --git a/debian/changelog b/debian/changelog
index 6c03cd3..bded823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 shim (0~20120728.3df9e294-0ubuntu1) UNRELEASED; urgency=low
 
   * Initial release.
+  * Include the Canonical Secure Boot master CA (cert.der) and include as
+    cert.h at build time.
 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 29 Aug 2012 15:51:10 -0700
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..3e72e2a
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+cert.h
diff --git a/debian/rules b/debian/rules
index 5344554..0979910 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,11 @@
 %:
 	dh $@
 
-override_dh_auto_build:
+override_dh_auto_build: cert.h
 	dh_auto_build -- EFI_PATH=/usr/lib
+
+cert.h: cert.der
+	echo 'static UINT8 vendor_cert[] = {' > $@.new
+	od -tx1 -w12 cert.der | cut -b9- | sed -e's/\([0-9a-f][0-9a-f]\)/0x\1,/g' >> $@.new
+	echo '};' >> $@.new
+	mv $@.new $@
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..b86e656
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+cert.der