yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 18:35:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ECDH: Include Everest Curve25519 in build scripts

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2018-10-25 12:47:03 +01:00 committed by Janos Follath
parent de4fcf2ae3
commit d5fd766c49
7 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
3rdparty/everest/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
*.o

2
CMakeLists.txt
View file

@ -176,7 +176,7 @@ else()
set(LIB_INSTALL_DIR lib) set(LIB_INSTALL_DIR lib)
endif() endif()
include_directories(include/) include_directories(include/ 3rdparty/everest/include/ 3rdparty/everest/include/everest/ 3rdparty/everest/include/everest/kremlin/ 3rdparty/everest/include/everest/kremlib/)
include_directories(library/) include_directories(library/)
add_subdirectory(library) add_subdirectory(library)

3
include/CMakeLists.txt
View file

@ -4,8 +4,9 @@ if(INSTALL_MBEDTLS_HEADERS)
file(GLOB headers "mbedtls/*.h") file(GLOB headers "mbedtls/*.h")
file(GLOB psa_headers "psa/*.h") file(GLOB psa_headers "psa/*.h")
file(GLOB everest_headers "../3rdparty/everest/include/*.h")
install(FILES ${headers} install(FILES ${headers} ${everest_headers}
DESTINATION include/mbedtls DESTINATION include/mbedtls
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)

9
library/CMakeLists.txt
View file

@ -94,6 +94,15 @@ set(src_crypto
) )
endif() endif()
set(src_everest
../3rdparty/everest/library/everest.c
../3rdparty/everest/library/Hacl_Curve25519.c
../3rdparty/everest/library/x25519.c
../3rdparty/everest/library/kremlib/fstar_uint128.c
../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c
)
set(src_crypto ${src_crypto} ${src_everest})
if(CMAKE_COMPILER_IS_GNUCC) if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-declarations -Wmissing-prototypes") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-declarations -Wmissing-prototypes")
endif(CMAKE_COMPILER_IS_GNUCC) endif(CMAKE_COMPILER_IS_GNUCC)

14
library/Makefile
View file

@ -19,6 +19,9 @@ endif
# To compile on Plan9: # To compile on Plan9:
# CFLAGS += -D_BSD_EXTENSION # CFLAGS += -D_BSD_EXTENSION
# Include directories for Everest code
CFLAGS+=-I../3rdparty/everest/include -I../3rdparty/everest/include/everest -I../3rdparty/everest/include/everest/kremlib
# if were running on Windows build for Windows # if were running on Windows build for Windows
ifdef WINDOWS ifdef WINDOWS
WINDOWS_BUILD=1 WINDOWS_BUILD=1
@ -101,6 +104,13 @@ OBJS_CRYPTO += version.o
OBJS_CRYPTO += version_features.o OBJS_CRYPTO += version_features.o
endif endif
OBJS_CRYPTO+= \
../3rdparty/everest/library/everest.o \
../3rdparty/everest/library/Hacl_Curve25519.o \
../3rdparty/everest/library/x25519.o \
../3rdparty/everest/library/kremlib/fstar_uint128.o \
../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.o
.SILENT: .SILENT:
.PHONY: all static shared clean .PHONY: all static shared clean
@ -148,8 +158,10 @@ libmbedcrypto.dll: $(OBJS_CRYPTO)
clean: clean:
ifndef WINDOWS ifndef WINDOWS
rm -f *.o libmbed* rm -f *.o libmbed* $(OBJS_CRYPTO)
else else
if exist *.o del /Q /F *.o if exist *.o del /Q /F *.o
if exist libmbed* del /Q /F libmbed* if exist libmbed* del /Q /F libmbed*
if exist $(OBJS_CRYPTO) del /Q /F $(OBJS_CRYPTO)
endif endif

2
programs/Makefile
View file

@ -11,6 +11,8 @@ LOCAL_CXXFLAGS = $(WARNING_CXXFLAGS) -I../include -D_FILE_OFFSET_BITS=64
LOCAL_LDFLAGS = -L../library \ LOCAL_LDFLAGS = -L../library \
-lmbedcrypto$(SHARED_SUFFIX) -lmbedcrypto$(SHARED_SUFFIX)
LOCAL_CFLAGS+=-I../3rdparty/everest/include
ifndef SHARED ifndef SHARED
DEP=../library/libmbedcrypto.a DEP=../library/libmbedcrypto.a
else else

2
tests/Makefile
View file

@ -10,6 +10,8 @@ LOCAL_CFLAGS = $(WARNING_CFLAGS) $(CRYPTO_INCLUDES) -I../library -D_FILE_OFFSET_
LOCAL_LDFLAGS = -L../library \ LOCAL_LDFLAGS = -L../library \
-lmbedcrypto$(SHARED_SUFFIX) -lmbedcrypto$(SHARED_SUFFIX)
LOCAL_CFLAGS+=-I../3rdparty/everest/include
# Enable definition of various functions used throughout the testsuite # Enable definition of various functions used throughout the testsuite
# (gethostname, strdup, fileno...) even when compiling with -std=c99. Harmless # (gethostname, strdup, fileno...) even when compiling with -std=c99. Harmless
# on non-POSIX platforms. # on non-POSIX platforms.