From 44432ef7b10d63742dd599436b148e1538109dbd Mon Sep 17 00:00:00 2001
From: Samuel Aubertin <samuel.aubertin@gmail.com>
Date: Thu, 15 Sep 2022 15:10:07 +0200
Subject: [PATCH] Build make-legit

---
 README.md                  |  8 ++++++++
 trusting-make/src/Makefile | 14 ++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9a333e4..21de0eb 100644
--- a/README.md
+++ b/README.md
@@ -2,5 +2,13 @@
 -----
 Samuel AUBERTIN
 
+## Run the PoC
+
+From Linux, using Packer, Vagrant, libvirt and KVM:
+
 ```make -C trusting-make all```
 
+
+## Slides
+
+https://docs.google.com/presentation/d/1rKMD3u2tbNSE6_ypi_QjC_2FzvNJtd_HoEDV-z6lBU0/edit?usp=sharing
diff --git a/trusting-make/src/Makefile b/trusting-make/src/Makefile
index c2bbc95..bfa889a 100644
--- a/trusting-make/src/Makefile
+++ b/trusting-make/src/Makefile
@@ -1,6 +1,6 @@
 TEMP!?=		mktemp -d /tmp/evil-XXXXXX
 LEGIT_SRC=	/usr/src/usr.bin/make
-LEGIT_BIN=	/usr/bin/make
+LEGIT_BIN=	make-legit
 BACKDOOR_SRC=	make-src-backdoor
 BACKDOOR_BIN=	make-bin-backdoor
 PATCH=		$(TEMP)/backdoor.patch
@@ -18,10 +18,16 @@ all: $(HAL) $(BACKDOORED_HAL)
 	echo "\033[94m6 - Trying \033[3m$(BACKDOORED_HAL)\033[23m with\033[36m" $(PASS)
 	echo $(PASS) | $(BACKDOORED_HAL)
 
+$(LEGIT_BIN):
+	echo "\033[94m0 - Compiling $@ with system make from legit source\033[0m"
+	$(MAKE) -s -C $(LEGIT_SRC) clean
+	$(MAKE) -s -C $(LEGIT_SRC)
+	mv $(LEGIT_SRC)/make $@
+	echo "\033[94m    make-legit = \033[3m$@\033[0m"
 
-$(HAL): 
-	echo "\033[94m1 - Compiling HAL9000 with legit make from legit source\033[0m"
-	$(MAKE) -C $(HALSRC)
+$(HAL): $(LEGIT_BIN)
+	echo "\033[94m1 - Compiling HAL9000 with make-legit from legit source\033[0m"
+	$(LEGIT_BIN) -C $(HALSRC)
 	cp $(HALSRC)/$(HAL) $@
 	echo "\033[94m    HAL9000 = \033[3m$@\033[0m"
 	$(MAKE) -C $(HALSRC) clean