Make the rust project the main application_processor directory

Purdue-eCTF · Jan 28, 2024 · f7795cc · f7795cc
1 parent 4f839ed
commit f7795cc
Show file tree

Hide file tree

Showing 30 changed files with 40 additions and 25 deletions.
diff --git a/application_processor/.cargo/config.toml b/application_processor/.cargo/config.toml
@@ -0,0 +1,7 @@
+[target.thumbv7em-none-eabihf]
+
+
+rustflags = [
+  "-C", "link-arg=--nmagic",
+  "-C", "link-arg=--verbose"
+]
diff --git a/rust_ap/Cargo.lock → application_processor/Cargo.lock b/rust_ap/Cargo.lock → application_processor/Cargo.lock
diff --git a/rust_ap/Cargo.toml → application_processor/Cargo.toml b/rust_ap/Cargo.toml → application_processor/Cargo.toml
diff --git a/application_processor/Makefile b/application_processor/Makefile
@@ -401,7 +401,7 @@ include $(LIBS_DIR)/libs.mk
 
 # Include the rules for building for this target. All other makefiles should be
 # included before this one.
-include $(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/$(COMPILER)/$(TARGET_LC).mk
+include $(TARGET_LC).mk
 
 # Include the rules that integrate the SBTs.  SBTs are a special case that must be
 # include after the core gcc rules to extend them.
@@ -416,13 +416,15 @@ MAKECMDGOALS:=$(.DEFAULT_GOAL)
 endif
 
 
-all:
+all: lib
 # 	Extend the functionality of the "all" recipe here
-	arm-none-eabi-size --format=berkeley $(BUILD_DIR)/$(PROJECT).elf
+	mv $(BUILD_DIR)/$(PROJECT).a $(BUILD_DIR)/lib$(PROJECT).a
+	mkdir -p ../build
+	cargo make -e BUILD_TYPE=release ap --verbose
 
 libclean: 
 	$(MAKE)  -f ${PERIPH_DRIVER_DIR}/periphdriver.mk clean.periph
-	
+
 clean: 
 #	Extend the functionality of the "clean" recipe here
 

diff --git a/rust_ap/Makefile.toml → application_processor/Makefile.toml b/rust_ap/Makefile.toml → application_processor/Makefile.toml
diff --git a/rust_ap/bindgen.h → application_processor/bindgen.h b/rust_ap/bindgen.h → application_processor/bindgen.h
@@ -17,4 +17,5 @@
 #include "mxc_errors.h"
 #include "string.h"
 #include "stdbool.h"
-#include "stdint.h"
+#include "stdint.h"
+#include "global_secrets.h"
diff --git a/rust_ap/build.rs → application_processor/build.rs b/rust_ap/build.rs → application_processor/build.rs
diff --git a/rust_ap/gcc.mk → application_processor/gcc.mk b/rust_ap/gcc.mk → application_processor/gcc.mk
diff --git a/rust_ap/max78000.mk → application_processor/max78000.mk b/rust_ap/max78000.mk → application_processor/max78000.mk
diff --git a/rust_ap/memory.x → application_processor/memory.x b/rust_ap/memory.x → application_processor/memory.x
diff --git a/application_processor/project.mk b/application_processor/project.mk
@@ -19,23 +19,21 @@ override BOARD=FTHR_RevA
 MFLOAT_ABI=soft
 
 IPATH+=../deployment
-IPATH+=inc/
-VPATH+=src/
 
 # ****************** eCTF Bootloader *******************
 # DO NOT REMOVE
 LINKERFILE=firmware.ld
 STARTUPFILE=startup_firmware.S
 ENTRY=firmware_startup
 
+
 # ****************** eCTF Crypto Example *******************
 # Uncomment the commented lines below and comment the disable
 # lines to enable the eCTF Crypto Example.
 # WolfSSL must be included in this directory as wolfssl/
 # WolfSSL can be downloaded from: https://www.wolfssl.com/download/
 
 # Disable Crypto Example
-CRYPTO_EXAMPLE=0
 
 # Enable Crypto Example
 #CRYPTO_EXAMPLE=1
diff --git a/rust_ap/src/bindings.rs → application_processor/src/bindings.rs b/rust_ap/src/bindings.rs → application_processor/src/bindings.rs
diff --git a/rust_ap/src/main.rs → application_processor/src/main.rs b/rust_ap/src/main.rs → application_processor/src/main.rs
@@ -8,7 +8,7 @@ mod bindings;
 #[no_mangle]
 pub extern "C" fn main(_argc: isize, _argv: *const *const u8) -> isize {
     unsafe {
-        bindings::tmpfile();
+
     }
     0
 }

diff --git a/ectf_tools/build_ap.py b/ectf_tools/build_ap.py
@@ -69,15 +69,14 @@ def build_ap(
 
     logger.info("Running build")
     output = asyncio.run(run_shell(
-        f" cd {design} "
-        f" && pwd"
-        f" && nix-shell --command \""
-        f" cd rust_ap"
-        f" &&  make clean"
-        f" &&  make && make release"
-        # f" &&  cp build/max78000.elf {output_elf} "
-        # f" &&  cp build/max78000.bin {output_bin}"
-        f"\""
+        f"cd {design} && "
+        f"pwd && "
+        f"nix-shell --command "
+        f"\"cd application_processor && "
+        f" make clean && "
+        f" make && make release && "
+        f" cp build/max78000.elf {output_elf} && "
+        f" cp build/max78000.bin {output_bin}\""
     ))
 
     if not os.path.exists(output_bin):

diff --git a/rust_ap/Makefile → insecure_application_processor/Makefile b/rust_ap/Makefile → insecure_application_processor/Makefile
@@ -401,7 +401,7 @@ include $(LIBS_DIR)/libs.mk
 
 # Include the rules for building for this target. All other makefiles should be
 # included before this one.
-include $(TARGET_LC).mk
+include $(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/$(COMPILER)/$(TARGET_LC).mk
 
 # Include the rules that integrate the SBTs.  SBTs are a special case that must be
 # include after the core gcc rules to extend them.
@@ -416,15 +416,13 @@ MAKECMDGOALS:=$(.DEFAULT_GOAL)
 endif
 
 
-all: lib
+all:
 # 	Extend the functionality of the "all" recipe here
-	mv $(BUILD_DIR)/$(PROJECT).a $(BUILD_DIR)/lib$(PROJECT).a
-	mkdir -p ../build
-	cargo make -e BUILD_TYPE=release ap --verbose
+	arm-none-eabi-size --format=berkeley $(BUILD_DIR)/$(PROJECT).elf
 
 libclean: 
 	$(MAKE)  -f ${PERIPH_DRIVER_DIR}/periphdriver.mk clean.periph
-
+	
 clean: 
 #	Extend the functionality of the "clean" recipe here
 

diff --git a/rust_ap/firmware.ld → insecure_application_processor/firmware.ld b/rust_ap/firmware.ld → insecure_application_processor/firmware.ld
diff --git a/application_processor/inc/board_link.h → ...re_application_processor/inc/board_link.h b/application_processor/inc/board_link.h → ...re_application_processor/inc/board_link.h
diff --git a/insecure_application_processor/inc/ectf_params.h b/insecure_application_processor/inc/ectf_params.h
@@ -0,0 +1,8 @@
+#ifndef __ECTF_PARAMS__
+#define __ECTF_PARAMS__
+#define AP_PIN "123456"
+#define AP_TOKEN "0123456789abcdef"
+#define COMPONENT_IDS 0x11111124, 0x11111125
+#define COMPONENT_CNT 2
+#define AP_BOOT_MSG "Test boot message"
+#endif
diff --git a/application_processor/inc/host_messaging.h → ...pplication_processor/inc/host_messaging.h b/application_processor/inc/host_messaging.h → ...pplication_processor/inc/host_messaging.h
diff --git a/application_processor/inc/simple_crypto.h → ...application_processor/inc/simple_crypto.h b/application_processor/inc/simple_crypto.h → ...application_processor/inc/simple_crypto.h
diff --git a/application_processor/inc/simple_flash.h → ..._application_processor/inc/simple_flash.h b/application_processor/inc/simple_flash.h → ..._application_processor/inc/simple_flash.h
diff --git a/...ion_processor/inc/simple_i2c_controller.h → ...ion_processor/inc/simple_i2c_controller.h b/...ion_processor/inc/simple_i2c_controller.h → ...ion_processor/inc/simple_i2c_controller.h
diff --git a/rust_ap/project.mk → insecure_application_processor/project.mk b/rust_ap/project.mk → insecure_application_processor/project.mk
@@ -19,21 +19,23 @@ override BOARD=FTHR_RevA
 MFLOAT_ABI=soft
 
 IPATH+=../deployment
+IPATH+=inc/
+VPATH+=src/
 
 # ****************** eCTF Bootloader *******************
 # DO NOT REMOVE
 LINKERFILE=firmware.ld
 STARTUPFILE=startup_firmware.S
 ENTRY=firmware_startup
 
-
 # ****************** eCTF Crypto Example *******************
 # Uncomment the commented lines below and comment the disable
 # lines to enable the eCTF Crypto Example.
 # WolfSSL must be included in this directory as wolfssl/
 # WolfSSL can be downloaded from: https://www.wolfssl.com/download/
 
 # Disable Crypto Example
+CRYPTO_EXAMPLE=0
 
 # Enable Crypto Example
 #CRYPTO_EXAMPLE=1
diff --git a/...ion_processor/src/application_processor.c → ...ion_processor/src/application_processor.c b/...ion_processor/src/application_processor.c → ...ion_processor/src/application_processor.c
diff --git a/application_processor/src/board_link.c → ...re_application_processor/src/board_link.c b/application_processor/src/board_link.c → ...re_application_processor/src/board_link.c
diff --git a/application_processor/src/host_messaging.c → ...pplication_processor/src/host_messaging.c b/application_processor/src/host_messaging.c → ...pplication_processor/src/host_messaging.c
diff --git a/application_processor/src/simple_crypto.c → ...application_processor/src/simple_crypto.c b/application_processor/src/simple_crypto.c → ...application_processor/src/simple_crypto.c
diff --git a/application_processor/src/simple_flash.c → ..._application_processor/src/simple_flash.c b/application_processor/src/simple_flash.c → ..._application_processor/src/simple_flash.c
diff --git a/...ion_processor/src/simple_i2c_controller.c → ...ion_processor/src/simple_i2c_controller.c b/...ion_processor/src/simple_i2c_controller.c → ...ion_processor/src/simple_i2c_controller.c
diff --git a/rust_ap/startup_firmware.S → ..._application_processor/startup_firmware.S b/rust_ap/startup_firmware.S → ..._application_processor/startup_firmware.S