yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-06 23:29:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97 from Patater/tls-generated-sources

Browse source 
Use generated source files from Mbed TLS
This commit is contained in:
Jaeden Amero 2019-04-29 11:07:48 +01:00 committed by GitHub
parent 521dbc67da 18d4789947
commit b978282aaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
library/CMakeLists.txt
View file

@ -29,7 +29,6 @@ set(src_crypto
ecp_curves.c ecp_curves.c
entropy.c entropy.c
entropy_poll.c entropy_poll.c
error.c
gcm.c gcm.c
havege.c havege.c
hkdf.c hkdf.c
@ -65,11 +64,27 @@ set(src_crypto
sha512.c sha512.c
threading.c threading.c
timing.c timing.c
version.c
version_features.c
xtea.c xtea.c
) )
# For files generated by the parent project (Mbed TLS) when building Mbed
# Crypto as a submodule, ensure that the parent project instance is used.
if(USE_CRYPTO_SUBMODULE)
set(src_crypto
${src_crypto}
${CMAKE_SOURCE_DIR}/library/version.c
${CMAKE_SOURCE_DIR}/library/version_features.c
${CMAKE_SOURCE_DIR}/library/error.c
)
else()
set(src_crypto
${src_crypto}
version.c
version_features.c
error.c
)
endif()
set(src_x509 set(src_x509
certs.c certs.c
pkcs11.c pkcs11.c

22
library/Makefile
View file

@ -73,7 +73,7 @@ OBJS_CRYPTO= aes.o aesni.o arc4.o \
dhm.o ecdh.o ecdsa.o \ dhm.o ecdh.o ecdsa.o \
ecjpake.o ecp.o \ ecjpake.o ecp.o \
ecp_curves.o entropy.o entropy_poll.o \ ecp_curves.o entropy.o entropy_poll.o \
error.o gcm.o havege.o \ gcm.o havege.o \
hkdf.o \ hkdf.o \
hmac_drbg.o md.o md2.o \ hmac_drbg.o md.o md2.o \
md4.o md5.o md_wrap.o \ md4.o md5.o md_wrap.o \
@ -88,8 +88,22 @@ OBJS_CRYPTO= aes.o aesni.o arc4.o \
psa_its_file.o \ psa_its_file.o \
ripemd160.o rsa_internal.o rsa.o \ ripemd160.o rsa_internal.o rsa.o \
sha1.o sha256.o sha512.o \ sha1.o sha256.o sha512.o \
threading.o timing.o version.o \ threading.o timing.o \
version_features.o xtea.o xtea.o
# For files generated by the parent project (Mbed TLS) when building Mbed
# Crypto as a submodule, ensure that the parent project instance is used.
ifeq ($(USE_CRYPTO_SUBMODULE), 1)
OBJS_CRYPTO += ../../library/error.o
OBJS_CRYPTO += ../../library/version.o
OBJS_CRYPTO += ../../library/version_features.o
else
OBJS_CRYPTO += error.o
OBJS_CRYPTO += version.o
OBJS_CRYPTO += version_features.o
endif
$(info $(OBJS_CRYPTO))
OBJS_X509= certs.o pkcs11.o x509.o \ OBJS_X509= certs.o pkcs11.o x509.o \
x509_create.o x509_crl.o x509_crt.o \ x509_create.o x509_crl.o x509_crt.o \
@ -198,7 +212,7 @@ libmbedcrypto.dll: $(OBJS_CRYPTO)
.c.o: .c.o:
echo " CC $<" echo " CC $<"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) -c $< $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -c $< -o $@
clean: clean:
ifndef WINDOWS ifndef WINDOWS