From 2b3aa1d5e0c0d050d42539b558f27af8605a674a Mon Sep 17 00:00:00 2001 From: Frank Voorburg Date: Mon, 23 Mar 2020 22:34:32 +0100 Subject: [PATCH] Moved aes256 sources to the main source directory. --- ChangeLog | 12 ++++++++++++ demos/ARM_CORTEXM_ST_Nucleo_F091RC_GCC/makefile | 3 --- demos/LINUX_PC_GCC/CMakeLists.txt | 6 ------ demos/WINDOWS_PC_MSVC/CMakeLists.txt | 6 ------ lint/project.lnt | 2 +- source/microtbx.h | 2 +- source/{third_party/aes256/aes256.c => tbxaes256.c} | 2 +- source/{third_party/aes256/aes256.h => tbxaes256.h} | 0 source/tbxcrypto.c | 2 +- 9 files changed, 16 insertions(+), 19 deletions(-) rename source/{third_party/aes256/aes256.c => tbxaes256.c} (99%) rename source/{third_party/aes256/aes256.h => tbxaes256.h} (100%) diff --git a/ChangeLog b/ChangeLog index cc1fc25..aa11c3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +----------------------------------------------------------------------------------------- +2020-03-23 Frank Voorburg + +* Moved aes256 sources to the main source directory. +* Public release of version 0.9.2. + +----------------------------------------------------------------------------------------- +2020-03-01 Frank Voorburg + +* Minor fixes and improvements. +* Public release of version 0.9.1. + ----------------------------------------------------------------------------------------- 2019-08-22 Frank Voorburg diff --git a/demos/ARM_CORTEXM_ST_Nucleo_F091RC_GCC/makefile b/demos/ARM_CORTEXM_ST_Nucleo_F091RC_GCC/makefile index dab8ddd..912a782 100644 --- a/demos/ARM_CORTEXM_ST_Nucleo_F091RC_GCC/makefile +++ b/demos/ARM_CORTEXM_ST_Nucleo_F091RC_GCC/makefile @@ -58,9 +58,6 @@ PROJ_FILES = $(call rwildcard, , *.c *.h *.s) # Collect MicroTBX sources PROJ_FILES += $(wildcard ../../source/*.c) PROJ_FILES += $(wildcard ../../source/*.h) -# Collect MiroTBX third party sources -PROJ_FILES += $(wildcard ../../source/third_party/aes256/*.c) -PROJ_FILES += $(wildcard ../../source/third_party/aes256/*.h) # Collect MicroTBX port and compiler specific sources PROJ_FILES += $(wildcard ../../source/port/ARM_CORTEXM/*.c) PROJ_FILES += $(wildcard ../../source/port/ARM_CORTEXM/*.h) diff --git a/demos/LINUX_PC_GCC/CMakeLists.txt b/demos/LINUX_PC_GCC/CMakeLists.txt index f28568b..791b31e 100644 --- a/demos/LINUX_PC_GCC/CMakeLists.txt +++ b/demos/LINUX_PC_GCC/CMakeLists.txt @@ -60,7 +60,6 @@ set(MICROTBX_BASE ${PROJECT_SOURCE_DIR}/../../source) set(MICROTBX_INCS "${MICROTBX_BASE}" "${MICROTBX_BASE}/port/WINDOWS" - "${MICROTBX_BASE}/third_party/aes256" ) @@ -90,14 +89,9 @@ file(GLOB MICROTBX_PORT_SRCS "${MICROTBX_BASE}/port/LINUX/*.h" "${MICROTBX_BASE}/port/LINUX/*.c" ) -file(GLOB MICROTBX_THIRDPARTY_SRCS - "${MICROTBX_BASE}/third_party/aes256/*.h" - "${MICROTBX_BASE}/third_party/aes256/*.c" -) set(MICROTBX_SRCS "${MICROTBX_CORE_SRCS}" "${MICROTBX_PORT_SRCS}" - "${MICROTBX_THIRDPARTY_SRCS}" ) # Add program sources diff --git a/demos/WINDOWS_PC_MSVC/CMakeLists.txt b/demos/WINDOWS_PC_MSVC/CMakeLists.txt index d5e7be8..db5be81 100644 --- a/demos/WINDOWS_PC_MSVC/CMakeLists.txt +++ b/demos/WINDOWS_PC_MSVC/CMakeLists.txt @@ -63,7 +63,6 @@ set(MICROTBX_BASE ${PROJECT_SOURCE_DIR}/../../source) set(MICROTBX_INCS "${MICROTBX_BASE}" "${MICROTBX_BASE}/port/WINDOWS" - "${MICROTBX_BASE}/third_party/aes256" ) @@ -93,14 +92,9 @@ file(GLOB MICROTBX_PORT_SRCS "${MICROTBX_BASE}/port/WINDOWS/*.h" "${MICROTBX_BASE}/port/WINDOWS/*.c" ) -file(GLOB MICROTBX_THIRDPARTY_SRCS - "${MICROTBX_BASE}/third_party/aes256/*.h" - "${MICROTBX_BASE}/third_party/aes256/*.c" -) set(MICROTBX_SRCS "${MICROTBX_CORE_SRCS}" "${MICROTBX_PORT_SRCS}" - "${MICROTBX_THIRDPARTY_SRCS}" ) # Add program sources diff --git a/lint/project.lnt b/lint/project.lnt index b268827..561fbee 100644 --- a/lint/project.lnt +++ b/lint/project.lnt @@ -6,6 +6,6 @@ tbxmempool.c tbxrandom.c tbxchecksum.c tbxcrypto.c -third_party/aes256/aes256.c +tbxaes256.c port/LINUX/tbxport.c diff --git a/source/microtbx.h b/source/microtbx.h index 42ac8e4..59706f8 100644 --- a/source/microtbx.h +++ b/source/microtbx.h @@ -72,7 +72,7 @@ extern "C" { #define TBX_VERSION_MINOR (9U) /** \brief Patch number of MicroTBX. */ -#define TBX_VERSION_PATCH (0U) +#define TBX_VERSION_PATCH (2U) /**************************************************************************************** diff --git a/source/third_party/aes256/aes256.c b/source/tbxaes256.c similarity index 99% rename from source/third_party/aes256/aes256.c rename to source/tbxaes256.c index 69f04f7..1613869 100644 --- a/source/third_party/aes256/aes256.c +++ b/source/tbxaes256.c @@ -18,7 +18,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include /* for standard integer types */ -#include "aes256.h" +#include "tbxaes256.h" static uint8_t rj_sbox(uint8_t x); static uint8_t rj_sbox_inv(uint8_t x); diff --git a/source/third_party/aes256/aes256.h b/source/tbxaes256.h similarity index 100% rename from source/third_party/aes256/aes256.h rename to source/tbxaes256.h diff --git a/source/tbxcrypto.c b/source/tbxcrypto.c index 02f8597..27fda76 100644 --- a/source/tbxcrypto.c +++ b/source/tbxcrypto.c @@ -35,7 +35,7 @@ * Include files ****************************************************************************************/ #include "microtbx.h" /* MicroTBX global header */ -#include "aes256.h" /* AES256 cryptography */ +#include "tbxaes256.h" /* AES256 cryptography */ /****************************************************************************************