mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-23 03:15:43 +01:00
825ebd483f
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
150 lines
4.8 KiB
Makefile
150 lines
4.8 KiB
Makefile
|
|
DESTDIR=/usr/local
|
|
PREFIX=mbedtls_
|
|
|
|
PROGRAMS_DIR=./programs
|
|
TESTS_DIR=./tests
|
|
|
|
# Check test environment. If ../library is available then Mbed TLS is used.
|
|
# Otherwise Mbed OS environment is used.
|
|
DIR_FOR_MBED_TLS_ENV=./library
|
|
ifneq "$(wildcard $(DIR_FOR_MBED_TLS_ENV) )" ""
|
|
LIBRARY_DIR=./library
|
|
INCLUDE_DIR=./include
|
|
CONFIG_FILE=./include/mbedtls/config.h
|
|
else
|
|
LIBRARY_DIR=./src
|
|
INCLUDE_DIR=./inc
|
|
CONFIG_FILE=./inc/mbedtls/test_config.h
|
|
endif
|
|
|
|
.SILENT:
|
|
|
|
.PHONY: all no_test programs lib tests install uninstall clean test check covtest lcov apidoc apidoc_clean
|
|
|
|
all: programs tests
|
|
$(MAKE) post_build
|
|
|
|
no_test: programs
|
|
|
|
programs: lib
|
|
$(MAKE) -C $(PROGRAMS_DIR)
|
|
|
|
lib:
|
|
$(MAKE) -C $(LIBRARY_DIR)
|
|
|
|
tests: lib
|
|
$(MAKE) -C $(TESTS_DIR)
|
|
|
|
ifndef WINDOWS
|
|
install: no_test
|
|
mkdir -p $(DESTDIR)/$(INCLUDE_DIR)/mbedtls
|
|
cp -rp $(INCLUDE_DIR)/mbedtls $(DESTDIR)/$(INCLUDE_DIR)
|
|
|
|
mkdir -p $(DESTDIR)/lib
|
|
cp -RP $(LIBRARY_DIR)/libmbedtls.* $(DESTDIR)/lib
|
|
cp -RP $(LIBRARY_DIR)/libmbedx509.* $(DESTDIR)/lib
|
|
cp -RP $(LIBRARY_DIR)/libmbedcrypto.* $(DESTDIR)/lib
|
|
|
|
mkdir -p $(DESTDIR)/bin
|
|
for p in $(PROGRAMS_DIR)/*/* ; do \
|
|
if [ -x $$p ] && [ ! -d $$p ] ; \
|
|
then \
|
|
f=$(PREFIX)`basename $$p` ; \
|
|
cp $$p $(DESTDIR)/bin/$$f ; \
|
|
fi \
|
|
done
|
|
|
|
uninstall:
|
|
rm -rf $(DESTDIR)/$(INCLUDE_DIR)/mbedtls
|
|
rm -f $(DESTDIR)/lib/libmbedtls.*
|
|
rm -f $(DESTDIR)/lib/libmbedx509.*
|
|
rm -f $(DESTDIR)/lib/libmbedcrypto.*
|
|
|
|
for p in $(PROGRAMS_DIR)/*/* ; do \
|
|
if [ -x $$p ] && [ ! -d $$p ] ; \
|
|
then \
|
|
f=$(PREFIX)`basename $$p` ; \
|
|
rm -f $(DESTDIR)/bin/$$f ; \
|
|
fi \
|
|
done
|
|
endif
|
|
|
|
WARNING_BORDER =*******************************************************\n
|
|
NULL_ENTROPY_WARN_L1=**** WARNING! MBEDTLS_TEST_NULL_ENTROPY defined! ****\n
|
|
NULL_ENTROPY_WARN_L2=**** THIS BUILD HAS NO DEFINED ENTROPY SOURCES ****\n
|
|
NULL_ENTROPY_WARN_L3=**** AND IS *NOT* SUITABLE FOR PRODUCTION USE ****\n
|
|
|
|
NULL_ENTROPY_WARNING=\n$(WARNING_BORDER)$(NULL_ENTROPY_WARN_L1)$(NULL_ENTROPY_WARN_L2)$(NULL_ENTROPY_WARN_L3)$(WARNING_BORDER)
|
|
|
|
WARNING_BORDER_LONG =**********************************************************************************\n
|
|
CTR_DRBG_128_BIT_KEY_WARN_L1=**** WARNING! MBEDTLS_CTR_DRBG_USE_128_BIT_KEY defined! ****\n
|
|
CTR_DRBG_128_BIT_KEY_WARN_L2=**** Using 128-bit keys for CTR_DRBG limits the security of generated ****\n
|
|
CTR_DRBG_128_BIT_KEY_WARN_L3=**** keys and operations that use random values generated to 128-bit security ****\n
|
|
|
|
CTR_DRBG_128_BIT_KEY_WARNING=\n$(WARNING_BORDER_LONG)$(CTR_DRBG_128_BIT_KEY_WARN_L1)$(CTR_DRBG_128_BIT_KEY_WARN_L2)$(CTR_DRBG_128_BIT_KEY_WARN_L3)$(WARNING_BORDER_LONG)
|
|
|
|
# Post build steps
|
|
post_build:
|
|
ifndef WINDOWS
|
|
|
|
# If 128-bit keys are configured for CTR_DRBG, display an appropriate warning
|
|
-scripts/config.pl -f $(CONFIG_FILE) get MBEDTLS_CTR_DRBG_USE_128_BIT_KEY && ([ $$? -eq 0 ]) && \
|
|
echo '$(CTR_DRBG_128_BIT_KEY_WARNING)'
|
|
|
|
# If NULL Entropy is configured, display an appropriate warning
|
|
-scripts/config.pl -f $(CONFIG_FILE) get MBEDTLS_TEST_NULL_ENTROPY && ([ $$? -eq 0 ]) && \
|
|
echo '$(NULL_ENTROPY_WARNING)'
|
|
endif
|
|
|
|
clean:
|
|
$(MAKE) -C $(LIBRARY_DIR) clean
|
|
$(MAKE) -C $(PROGRAMS_DIR) clean
|
|
$(MAKE) -C $(TESTS_DIR) clean
|
|
ifndef WINDOWS
|
|
find . \( -name \*.gcno -o -name \*.gcda -o -name \*.info \) -exec rm {} +
|
|
endif
|
|
|
|
check: lib tests
|
|
$(MAKE) -C $(TESTS_DIR) check
|
|
|
|
test: check
|
|
|
|
ifndef WINDOWS
|
|
# note: for coverage testing, build with:
|
|
# make CFLAGS='--coverage -g3 -O0'
|
|
covtest:
|
|
$(MAKE) check
|
|
$(PROGRAMS_DIR)/test/selftest
|
|
$(TESTS_DIR)/compat.sh
|
|
$(TESTS_DIR)/ssl-opt.sh
|
|
|
|
lcov:
|
|
rm -rf Coverage
|
|
lcov --capture --initial --directory $(LIBRARY_DIR) -o files.info
|
|
lcov --capture --directory $(LIBRARY_DIR) -o tests.info
|
|
lcov --add-tracefile files.info --add-tracefile tests.info -o all.info
|
|
lcov --remove all.info -o final.info '*.h'
|
|
gendesc tests/Descriptions.txt -o descriptions
|
|
genhtml --title "mbed TLS" --description-file descriptions --keep-descriptions --legend --no-branch-coverage -o Coverage final.info
|
|
rm -f files.info tests.info all.info final.info descriptions
|
|
|
|
apidoc:
|
|
mkdir -p apidoc
|
|
cd doxygen && doxygen mbedtls.doxyfile
|
|
|
|
apidoc_clean:
|
|
rm -rf apidoc
|
|
endif
|
|
|
|
## Editor navigation files
|
|
C_SOURCE_FILES = $(wildcard $(INCLUDE_DIR)/*/*.h $(LIBRARY_DIR)/*.[hc] $(PROGRAMS_DIR)/*/*.[hc] $(TESTS_DIR)/suites/*.function)
|
|
# Exuberant-ctags invocation. Other ctags implementations may require different options.
|
|
CTAGS = ctags --langmap=c:+.h.function -o
|
|
tags: $(C_SOURCE_FILES)
|
|
$(CTAGS) $@ $(C_SOURCE_FILES)
|
|
TAGS: $(C_SOURCE_FILES)
|
|
etags -o $@ $(C_SOURCE_FILES)
|
|
GPATH GRTAGS GSYMS GTAGS: $(C_SOURCE_FILES)
|
|
ls $(C_SOURCE_FILES) | gtags -f - --gtagsconf .globalrc
|