From d937c43211ae4c34c3d55957e5648fa37a3e978d Mon Sep 17 00:00:00 2001 From: Gregor Haas Date: Sun, 8 Dec 2019 18:15:08 -0500 Subject: [PATCH] More project structure changes --- CMakeLists.txt | 18 +++++++++--------- {libusb => checkm8_libusb}/COPYING | 0 {libusb => checkm8_libusb}/config.h | 0 {libusb => checkm8_libusb}/src/core.c | 0 {libusb => checkm8_libusb}/src/descriptor.c | 0 {libusb => checkm8_libusb}/src/hotplug.c | 0 {libusb => checkm8_libusb}/src/hotplug.h | 0 {libusb => checkm8_libusb}/src/io.c | 0 {libusb => checkm8_libusb}/src/libusb-1.0.def | 0 {libusb => checkm8_libusb}/src/libusb-1.0.rc | 0 {libusb => checkm8_libusb}/src/libusb.h | 0 {libusb => checkm8_libusb}/src/libusbi.h | 0 .../src/os/linux_netlink.c | 0 {libusb => checkm8_libusb}/src/os/linux_udev.c | 0 .../src/os/linux_usbfs.c | 0 .../src/os/linux_usbfs.h | 0 {libusb => checkm8_libusb}/src/os/poll_posix.c | 0 {libusb => checkm8_libusb}/src/os/poll_posix.h | 0 .../src/os/poll_windows.c | 0 .../src/os/poll_windows.h | 0 .../src/os/threads_posix.c | 0 .../src/os/threads_posix.h | 0 {libusb => checkm8_libusb}/src/strerror.c | 0 {libusb => checkm8_libusb}/src/sync.c | 0 {libusb => checkm8_libusb}/src/version.h | 0 {libusb => checkm8_libusb}/src/version_nano.h | 0 .../CMakeLists.txt | 4 ++++ checkm8_payloads/test.c | 5 +++++ 28 files changed, 18 insertions(+), 9 deletions(-) rename {libusb => checkm8_libusb}/COPYING (100%) rename {libusb => checkm8_libusb}/config.h (100%) rename {libusb => checkm8_libusb}/src/core.c (100%) rename {libusb => checkm8_libusb}/src/descriptor.c (100%) rename {libusb => checkm8_libusb}/src/hotplug.c (100%) rename {libusb => checkm8_libusb}/src/hotplug.h (100%) rename {libusb => checkm8_libusb}/src/io.c (100%) rename {libusb => checkm8_libusb}/src/libusb-1.0.def (100%) rename {libusb => checkm8_libusb}/src/libusb-1.0.rc (100%) rename {libusb => checkm8_libusb}/src/libusb.h (100%) rename {libusb => checkm8_libusb}/src/libusbi.h (100%) rename {libusb => checkm8_libusb}/src/os/linux_netlink.c (100%) rename {libusb => checkm8_libusb}/src/os/linux_udev.c (100%) rename {libusb => checkm8_libusb}/src/os/linux_usbfs.c (100%) rename {libusb => checkm8_libusb}/src/os/linux_usbfs.h (100%) rename {libusb => checkm8_libusb}/src/os/poll_posix.c (100%) rename {libusb => checkm8_libusb}/src/os/poll_posix.h (100%) rename {libusb => checkm8_libusb}/src/os/poll_windows.c (100%) rename {libusb => checkm8_libusb}/src/os/poll_windows.h (100%) rename {libusb => checkm8_libusb}/src/os/threads_posix.c (100%) rename {libusb => checkm8_libusb}/src/os/threads_posix.h (100%) rename {libusb => checkm8_libusb}/src/strerror.c (100%) rename {libusb => checkm8_libusb}/src/sync.c (100%) rename {libusb => checkm8_libusb}/src/version.h (100%) rename {libusb => checkm8_libusb}/src/version_nano.h (100%) rename {checkm8_payload => checkm8_payloads}/CMakeLists.txt (50%) create mode 100644 checkm8_payloads/test.c diff --git a/CMakeLists.txt b/CMakeLists.txt index d31b7f4..844608e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,17 +2,17 @@ cmake_minimum_required(VERSION 3.10) project(ipwndfu_rewrite_c) enable_language(C) -include_directories(libusb/src/) +include_directories(checkm8_libusb/src/) add_library(checkm8_libusb - checkm8_conf.h libusb/config.h + checkm8_conf.h checkm8_libusb/config.h - libusb/src/core.c libusb/src/descriptor.c libusb/src/hotplug.c - libusb/src/io.c libusb/src/strerror.c libusb/src/sync.c - libusb/src/hotplug.h libusb/src/libusb.h libusb/src/libusbi.h libusb/src/version.h + checkm8_libusb/src/core.c checkm8_libusb/src/descriptor.c checkm8_libusb/src/hotplug.c + checkm8_libusb/src/io.c checkm8_libusb/src/strerror.c checkm8_libusb/src/sync.c + checkm8_libusb/src/hotplug.h checkm8_libusb/src/libusb.h checkm8_libusb/src/libusbi.h checkm8_libusb/src/version.h - libusb/src/os/linux_netlink.c libusb/src/os/linux_usbfs.c libusb/src/os/linux_udev.c - libusb/src/os/threads_posix.c libusb/src/os/poll_posix.c - libusb/src/os/linux_usbfs.h libusb/src/os/threads_posix.h libusb/src/os/poll_posix.h) + checkm8_libusb/src/os/linux_netlink.c checkm8_libusb/src/os/linux_usbfs.c checkm8_libusb/src/os/linux_udev.c + checkm8_libusb/src/os/threads_posix.c checkm8_libusb/src/os/poll_posix.c + checkm8_libusb/src/os/linux_usbfs.h checkm8_libusb/src/os/threads_posix.h checkm8_libusb/src/os/poll_posix.h) add_subdirectory(checkm8_remote) -add_subdirectory(checkm8_payload) +add_subdirectory(checkm8_payloads) diff --git a/libusb/COPYING b/checkm8_libusb/COPYING similarity index 100% rename from libusb/COPYING rename to checkm8_libusb/COPYING diff --git a/libusb/config.h b/checkm8_libusb/config.h similarity index 100% rename from libusb/config.h rename to checkm8_libusb/config.h diff --git a/libusb/src/core.c b/checkm8_libusb/src/core.c similarity index 100% rename from libusb/src/core.c rename to checkm8_libusb/src/core.c diff --git a/libusb/src/descriptor.c b/checkm8_libusb/src/descriptor.c similarity index 100% rename from libusb/src/descriptor.c rename to checkm8_libusb/src/descriptor.c diff --git a/libusb/src/hotplug.c b/checkm8_libusb/src/hotplug.c similarity index 100% rename from libusb/src/hotplug.c rename to checkm8_libusb/src/hotplug.c diff --git a/libusb/src/hotplug.h b/checkm8_libusb/src/hotplug.h similarity index 100% rename from libusb/src/hotplug.h rename to checkm8_libusb/src/hotplug.h diff --git a/libusb/src/io.c b/checkm8_libusb/src/io.c similarity index 100% rename from libusb/src/io.c rename to checkm8_libusb/src/io.c diff --git a/libusb/src/libusb-1.0.def b/checkm8_libusb/src/libusb-1.0.def similarity index 100% rename from libusb/src/libusb-1.0.def rename to checkm8_libusb/src/libusb-1.0.def diff --git a/libusb/src/libusb-1.0.rc b/checkm8_libusb/src/libusb-1.0.rc similarity index 100% rename from libusb/src/libusb-1.0.rc rename to checkm8_libusb/src/libusb-1.0.rc diff --git a/libusb/src/libusb.h b/checkm8_libusb/src/libusb.h similarity index 100% rename from libusb/src/libusb.h rename to checkm8_libusb/src/libusb.h diff --git a/libusb/src/libusbi.h b/checkm8_libusb/src/libusbi.h similarity index 100% rename from libusb/src/libusbi.h rename to checkm8_libusb/src/libusbi.h diff --git a/libusb/src/os/linux_netlink.c b/checkm8_libusb/src/os/linux_netlink.c similarity index 100% rename from libusb/src/os/linux_netlink.c rename to checkm8_libusb/src/os/linux_netlink.c diff --git a/libusb/src/os/linux_udev.c b/checkm8_libusb/src/os/linux_udev.c similarity index 100% rename from libusb/src/os/linux_udev.c rename to checkm8_libusb/src/os/linux_udev.c diff --git a/libusb/src/os/linux_usbfs.c b/checkm8_libusb/src/os/linux_usbfs.c similarity index 100% rename from libusb/src/os/linux_usbfs.c rename to checkm8_libusb/src/os/linux_usbfs.c diff --git a/libusb/src/os/linux_usbfs.h b/checkm8_libusb/src/os/linux_usbfs.h similarity index 100% rename from libusb/src/os/linux_usbfs.h rename to checkm8_libusb/src/os/linux_usbfs.h diff --git a/libusb/src/os/poll_posix.c b/checkm8_libusb/src/os/poll_posix.c similarity index 100% rename from libusb/src/os/poll_posix.c rename to checkm8_libusb/src/os/poll_posix.c diff --git a/libusb/src/os/poll_posix.h b/checkm8_libusb/src/os/poll_posix.h similarity index 100% rename from libusb/src/os/poll_posix.h rename to checkm8_libusb/src/os/poll_posix.h diff --git a/libusb/src/os/poll_windows.c b/checkm8_libusb/src/os/poll_windows.c similarity index 100% rename from libusb/src/os/poll_windows.c rename to checkm8_libusb/src/os/poll_windows.c diff --git a/libusb/src/os/poll_windows.h b/checkm8_libusb/src/os/poll_windows.h similarity index 100% rename from libusb/src/os/poll_windows.h rename to checkm8_libusb/src/os/poll_windows.h diff --git a/libusb/src/os/threads_posix.c b/checkm8_libusb/src/os/threads_posix.c similarity index 100% rename from libusb/src/os/threads_posix.c rename to checkm8_libusb/src/os/threads_posix.c diff --git a/libusb/src/os/threads_posix.h b/checkm8_libusb/src/os/threads_posix.h similarity index 100% rename from libusb/src/os/threads_posix.h rename to checkm8_libusb/src/os/threads_posix.h diff --git a/libusb/src/strerror.c b/checkm8_libusb/src/strerror.c similarity index 100% rename from libusb/src/strerror.c rename to checkm8_libusb/src/strerror.c diff --git a/libusb/src/sync.c b/checkm8_libusb/src/sync.c similarity index 100% rename from libusb/src/sync.c rename to checkm8_libusb/src/sync.c diff --git a/libusb/src/version.h b/checkm8_libusb/src/version.h similarity index 100% rename from libusb/src/version.h rename to checkm8_libusb/src/version.h diff --git a/libusb/src/version_nano.h b/checkm8_libusb/src/version_nano.h similarity index 100% rename from libusb/src/version_nano.h rename to checkm8_libusb/src/version_nano.h diff --git a/checkm8_payload/CMakeLists.txt b/checkm8_payloads/CMakeLists.txt similarity index 50% rename from checkm8_payload/CMakeLists.txt rename to checkm8_payloads/CMakeLists.txt index 09690cb..4d2b412 100644 --- a/checkm8_payload/CMakeLists.txt +++ b/checkm8_payloads/CMakeLists.txt @@ -3,4 +3,8 @@ enable_language(ASM) set(CMAKE_SYSTEM_PROCESSOR arm) set(CMAKE_C_COMPILER /usr/bin/aarch64-linux-gnu-gcc) set(CMAKE_ASM_COMPILER /usr/bin/aarch64-linux-gnu-as) +set(CMAKE_OBJCOPY /usr/bin/aarch64-linux-gnu-objcopy) +set(CMAKE_C_FLAGS "-nostdlib") +add_executable(payload_test test.c) +add_custom_command(OUTPUT payload.) \ No newline at end of file diff --git a/checkm8_payloads/test.c b/checkm8_payloads/test.c new file mode 100644 index 0000000..a454691 --- /dev/null +++ b/checkm8_payloads/test.c @@ -0,0 +1,5 @@ + +int _start(int b) +{ + return b * 5; +} \ No newline at end of file