yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 10:15:40 +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 20788e584d
commit cd5380abd5
6 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -181,6 +181,8 @@ else()
set(LIB_INSTALL_DIR lib)
endif()
include_directories(include/ 3rdparty/everest/include/ 3rdparty/everest/include/everest/ 3rdparty/everest/include/everest/kremlin/ 3rdparty/everest/include/everest/kremlib/)
if(ENABLE_ZLIB_SUPPORT)
find_package(ZLIB)

3
include/CMakeLists.txt
View file

@ -3,8 +3,9 @@ option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON)
if(INSTALL_MBEDTLS_HEADERS)
file(GLOB headers "mbedtls/*.h")
file(GLOB headers_everest "../3rdparty/everest/include/*.h")
install(FILES ${headers}
install(FILES ${headers} ${headers_everest}
DESTINATION include/mbedtls
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)

10
library/CMakeLists.txt
View file

@ -66,6 +66,16 @@ set(src_crypto
xtea.c
)
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})
set(src_x509
certs.c
pkcs11.c

17
library/Makefile
View file

@ -18,6 +18,9 @@ endif
# To compile on Plan9:
# 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
ifdef WINDOWS
WINDOWS_BUILD=1
@ -70,6 +73,13 @@ LOCAL_LDFLAGS += -L../crypto/library
LOCAL_CFLAGS += -I../crypto/include
CRYPTO := ../crypto/library/
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
OBJS_X509= certs.o pkcs11.o x509.o \
x509_create.o x509_crl.o x509_crt.o \
x509_csr.o x509write_crt.o x509write_csr.o
@ -153,11 +163,12 @@ libmbedcrypto.%:
.c.o:
echo " CC $<"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) -c $<
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) -o $@ -c $<
clean:
ifndef WINDOWS
rm -f *.o libmbed*
rm -f *.o libmbed* $(OBJS_CRYPTO)
else
del /Q /F *.o libmbed*
del /Q /F *.o libmbed* $(OBJS_CRYPTO)
endif

2
programs/Makefile
View file

@ -18,6 +18,8 @@ LOCAL_LDFLAGS += -L../crypto/library
LOCAL_CFLAGS += -I../crypto/include
LOCAL_CXXFLAGS += -I../crypto/include
LOCAL_CFLAGS+=-I../3rdparty/everest/include
ifndef SHARED
DEP=../crypto/library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a
else

3
tests/Makefile
View file

@ -16,6 +16,8 @@ LOCAL_LDFLAGS += -L../crypto/library
LOCAL_CFLAGS += -I../crypto/include
CRYPTO := ../crypto/library/
LOCAL_CFLAGS+=-I../3rdparty/everest/include
# Enable definition of various functions used throughout the testsuite
# (gethostname, strdup, fileno...) even when compiling with -std=c99. Harmless
# on non-POSIX platforms.
@ -185,4 +187,3 @@ $(EMBEDDED_TESTS): embedded_%: suites/$$(firstword $$(subst ., ,$$*)).function s
-o ./TESTS/mbedtls/$*
generate-target-tests: $(EMBEDDED_TESTS)