Skip to content

Commit

Permalink
updated submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
mrdcvlsc committed Sep 14, 2023
1 parent a4796de commit 3fe487b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 23 deletions.
44 changes: 22 additions & 22 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,60 +7,60 @@ EXECUTABLE=bethela
INSTALLPATH=/usr/local/bin
RBUFFER_FLAG=

OS := $(shell uname)
OS:=$(shell uname)

CXX:=g++
CXX_STANDARD=-std=c++17
CXX_STANDARD:=-std=c++17

ifeq ($(CXX), clang++)
THREADING=
THREADING:=
else
THREADING=
THREADING:=
endif

TYPE=release
VERSION=portable
LINK=dynamic
TYPE:=release
VERSION:=portable
LINK:=dynamic

ifeq ($(LINK), dynamic)
LINKER=
LINKER:=
else ifeq ($(LINK), static)
LINKER=-static
LINKER:=-static
endif

ifeq ($(CXX), clang++)
ADDRESS_SANITIZER=-fsanitize=address
THREADS_SANITIZER=-fsanitize=thread
ADDRESS_SANITIZER:=-fsanitize=address
THREADS_SANITIZER:=-fsanitize=thread
else
ADDRESS_SANITIZER=
THREADS_SANITIZER=
ADDRESS_SANITIZER:=
THREADS_SANITIZER:=
endif

ifeq ($(TYPE), release)
CXX_FLAGS=-O3 -Wall -Wextra
CXX_FLAGS:=-O3 -Wall -Wextra
else ifeq ($(TYPE), release2)
CXX_FLAGS=-O2 -Wall -Wextra
CXX_FLAGS:=-O2 -Wall -Wextra
else ifeq ($(TYPE), tune)
CXX_FLAGS=-O3 -march=native -mtune=native -mcpu=native -Wall -Wextra
CXX_FLAGS:=-O3 -march=native -mtune=native -mcpu=native -Wall -Wextra
else ifeq ($(TYPE), debug)
CXX_FLAGS=-O2 -Wall -Wextra $(ADDRESS_SANITIZER)
CXX_FLAGS:=-O2 -Wall -Wextra $(ADDRESS_SANITIZER)
else ifeq ($(TYPE), debug_threads)
CXX_FLAGS=-O2 -Wall -Wextra $(THREADS_SANITIZER)
CXX_FLAGS:=-O2 -Wall -Wextra $(THREADS_SANITIZER)
endif

ifeq ($(VERSION), portable)
COMPILATION_MSG="compiling portable version"
VERSION_FLAGS=
VERSION_FLAGS:=-DUSE_CXX_AES
else ifeq ($(VERSION), aesni)
COMPILATION_MSG="compiling AES-NI version"
VERSION_FLAGS=-DUSE_AESNI -D_USE_INTEL_AESNI -maes
VERSION_FLAGS:=-DUSE_AESNI -DUSE_INTEL_AESNI -maes
else ifeq ($(VERSION), neon)
COMPILATION_MSG="compiling AES aarch64 neon version"
VERSION_FLAGS=-DUSE_ARM_AES -D_USE_ARM_NEON_AES -march=armv8-a+crypto
VERSION_FLAGS:=-DUSE_ARM_AES -DUSE_NEON_AES -march=armv8-a+crypto
endif

ifeq ($(RBUFFER), stack)
RBUFFER_FLAG=-D_USE_RBUFFER_ON_STACK
RBUFFER_FLAG:=-D_USE_RBUFFER_ON_STACK
endif

.PHONY: default environment compile install uninstall encrypt_decrypt randfile checkfile genkeys vig_encrypt_decrypt clean
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,11 @@ bethela --dec-AES256-replace keyfile file1.bthl file2.bthl ... fileN.bthl
```
bethela --help
```

-----

### External Libraries

- [AES](https://github.com/mrdcvlsc/AES) - for AES encryption with hardware acceleration support.
- [BytePadding](https://github.com/mrdcvlsc/BytePadding) - for simple padding operations.
- [BlockCipherModes](https://github.com/mrdcvlsc/BlockCipherModes) - for block cipher encryption modes.
2 changes: 1 addition & 1 deletion include/AES

0 comments on commit 3fe487b

Please sign in to comment.