Skip to content

Commit

Permalink
Moved aes256 sources to the main source directory.
Browse files Browse the repository at this point in the history
  • Loading branch information
feaser committed Mar 23, 2020
1 parent 3e816c0 commit 2b3aa1d
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 19 deletions.
12 changes: 12 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
-----------------------------------------------------------------------------------------
2020-03-23 Frank Voorburg <[email protected]>

* Moved aes256 sources to the main source directory.
* Public release of version 0.9.2.

-----------------------------------------------------------------------------------------
2020-03-01 Frank Voorburg <[email protected]>

* Minor fixes and improvements.
* Public release of version 0.9.1.

-----------------------------------------------------------------------------------------
2019-08-22 Frank Voorburg <[email protected]>

Expand Down
3 changes: 0 additions & 3 deletions demos/ARM_CORTEXM_ST_Nucleo_F091RC_GCC/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 0 additions & 6 deletions demos/LINUX_PC_GCC/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)


Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions demos/WINDOWS_PC_MSVC/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)


Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lint/project.lnt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ tbxmempool.c
tbxrandom.c
tbxchecksum.c
tbxcrypto.c
third_party/aes256/aes256.c
tbxaes256.c
port/LINUX/tbxport.c

2 changes: 1 addition & 1 deletion source/microtbx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)


/****************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion source/third_party/aes256/aes256.c → source/tbxaes256.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <stdint.h> /* 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);
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion source/tbxcrypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* Include files
****************************************************************************************/
#include "microtbx.h" /* MicroTBX global header */
#include "aes256.h" /* AES256 cryptography */
#include "tbxaes256.h" /* AES256 cryptography */


/****************************************************************************************
Expand Down

0 comments on commit 2b3aa1d

Please sign in to comment.