8dd1690993
Resolve conflicts by performing the following operations:
- Reject changes related to building a crypto submodule, since Mbed
Crypto is the crypto submodule.
- Reject X.509, NET, and SSL changes.
- Reject changes to README, as Mbed Crypto is a different project from
Mbed TLS, with a different README.
- Avoid adding mention of ssl-opt.sh in a comment near some modified
code in include/CMakeLists.txt (around where ENABLE_TESTING as added).
- Align config.pl in Mbed TLS with config.pl in Mbed Crypto where PSA
options are concerned, to make future merging easier. There is no
reason for the two to be different in this regard, now that Mbed TLS
always depends on Mbed Crypto. Remaining differences are only the
PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER option and the absence of X.509,
NET, and SSL related options in Mbed Crypto's config.pl.
- Align config.h in Mbed Crypto with Mbed TLS's copy, with a few notable
exceptions:
- Leave CMAC on by default.
- Leave storage on by default (including ITS emulation).
- Avoid documenting the PSA Crypto API as is in beta stage in
documentation for MBEDTLS_PSA_CRYPTO_C.
The only remaining differences are a lack of X.509, NET, and SSL
options in Mbed Crypto's config.h, as well as an additional
Mbed-Crypto-specific PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER option.
Documentation for the check params feature and related macros is also
updated to match Mbed TLS's description.
- Reject tests/data_files/Makefile changes to generate DER versions of
CRTs and keys, as none of those are used by Mbed Crypto tests.
- Add the "no PEM and no filesystem" test to all.sh, without ssl-opt.sh
run, as Mbed Crypto doesn't have ssl-opt.sh. Also remove use of PSA
Crypto storage and ITS emulation, since those depend on filesystem
support.
- Reject addition of test when no ciphersuites have MAC to all.sh, as
the option being tested, MBEDTLS_SSL_SOME_MODES_USE_MAC, is not
present in Mbed Crypto.
- Use baremetal config in all.sh, as Mbed Crypto's baremetal
configuration does exclude the net module (as it doesn't exist in Mbed
Crypto)
- Reject cmake_subproject_build changes, continuing to link only
libmbedcrypto.
- Reject changes to visualc and associated templates. Mbed Crypto
doesn't need additional logic to handle submodule-sourced headers.
- Avoid adding fuzzers from Mbed TLS. The only relevant fuzzers are the
privkey and pubkey fuzzers, but non-trivial work would be required to
integrate those into Mbed Crypto (more than is comfortable in a merge
commit).
- Reject addition of Docker wrappers for compat.sh and ssl-opt.sh, as
those are not present in Mbed Crypto.
- Remove calls to SSL-related scripts from basic-in-docker.sh
Fix test errors by performing the following:
- Avoid using a link that Doxygen can't seem to resolve in Mbed Crypto,
but can resolve in Mbed TLS. In documentation for
MBEDTLS_CHECK_PARAMS, don't attempt to link to MBEDTLS_PARAM_FAILED.
* origin/development: (339 commits)
Do not build fuzz on windows
No booleans and import config
Removing space before opening parenthesis
Style corrections
Syntax fix
Fixes warnings from MSVC
Add a linker flag to enable gcov in basic-build-test.sh
Update crypto submodule to a revision with the HAVEGE header changes
Test with MBEDTLS_ECP_RESTARTABLE
Allow TODO in code
Use the docstring in the command line help
Split _abi_compliance_command into smaller functions
Record the commits that were compared
Document how to build the typical argument for -s
Allow running /somewhere/else/path/to/abi_check.py
tests: Limit each log to 10 GiB
Warn if VLAs are used
Remove redundant compiler flag
Consistently spell -Wextra
Fix parsing issue when int parameter is in base 16
...
115 lines
2.5 KiB
Bash
Executable file
115 lines
2.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# This file is part of mbed TLS (https://tls.mbed.org)
|
|
#
|
|
# Copyright (c) 2015-2019, ARM Limited, All Rights Reserved
|
|
|
|
set -eu
|
|
|
|
if [ $# -ne 0 ] && [ "$1" = "--help" ]; then
|
|
cat <<EOF
|
|
$0 [-v]
|
|
This script confirms that the naming of all symbols and identifiers in mbed
|
|
TLS are consistent with the house style and are also self-consistent.
|
|
|
|
-v If the script fails unexpectedly, print a command trace.
|
|
EOF
|
|
exit
|
|
fi
|
|
|
|
if grep --version|head -n1|grep GNU >/dev/null; then :; else
|
|
echo "This script requires GNU grep.">&2
|
|
exit 1
|
|
fi
|
|
|
|
trace=
|
|
if [ $# -ne 0 ] && [ "$1" = "-v" ]; then
|
|
shift
|
|
trace='-x'
|
|
exec 2>check-names.err
|
|
trap 'echo "FAILED UNEXPECTEDLY, status=$?";
|
|
cat check-names.err' EXIT
|
|
set -x
|
|
fi
|
|
|
|
printf "Analysing source code...\n"
|
|
|
|
sh $trace tests/scripts/list-macros.sh
|
|
tests/scripts/list-enum-consts.pl
|
|
sh $trace tests/scripts/list-identifiers.sh
|
|
sh $trace tests/scripts/list-symbols.sh
|
|
|
|
FAIL=0
|
|
|
|
printf "\nExported symbols declared in header: "
|
|
UNDECLARED=$( diff exported-symbols identifiers | sed -n -e 's/^< //p' )
|
|
if [ "x$UNDECLARED" = "x" ]; then
|
|
echo "PASS"
|
|
else
|
|
echo "FAIL"
|
|
echo "$UNDECLARED"
|
|
FAIL=1
|
|
fi
|
|
|
|
diff macros identifiers | sed -n -e 's/< //p' > actual-macros
|
|
|
|
for THING in actual-macros enum-consts; do
|
|
printf "Names of $THING: "
|
|
test -r $THING
|
|
BAD=$( grep -E -v '^(MBEDTLS|PSA)_[0-9A-Z_]*[0-9A-Z]$' $THING || true )
|
|
if [ "x$BAD" = "x" ]; then
|
|
echo "PASS"
|
|
else
|
|
echo "FAIL"
|
|
echo "$BAD"
|
|
FAIL=1
|
|
fi
|
|
done
|
|
|
|
for THING in identifiers; do
|
|
printf "Names of $THING: "
|
|
test -r $THING
|
|
BAD=$( grep -E -v '^(mbedtls|psa)_[0-9a-z_]*[0-9a-z]$' $THING || true )
|
|
if [ "x$BAD" = "x" ]; then
|
|
echo "PASS"
|
|
else
|
|
echo "FAIL"
|
|
echo "$BAD"
|
|
FAIL=1
|
|
fi
|
|
done
|
|
|
|
printf "Likely typos: "
|
|
sort -u actual-macros enum-consts > _caps
|
|
HEADERS=$( ls include/mbedtls/*.h include/psa/*.h | egrep -v 'compat-1\.3\.h' )
|
|
NL='
|
|
'
|
|
sed -n 's/MBED..._[A-Z0-9_]*/\'"$NL"'&\'"$NL"/gp \
|
|
$HEADERS library/*.c \
|
|
| grep MBEDTLS | sort -u > _MBEDTLS_XXX
|
|
TYPOS=$( diff _caps _MBEDTLS_XXX | sed -n 's/^> //p' \
|
|
| egrep -v 'XXX|__|_$|^MBEDTLS_.*CONFIG_FILE$' || true )
|
|
rm _MBEDTLS_XXX _caps
|
|
if [ "x$TYPOS" = "x" ]; then
|
|
echo "PASS"
|
|
else
|
|
echo "FAIL"
|
|
echo "$TYPOS"
|
|
FAIL=1
|
|
fi
|
|
|
|
if [ -n "$trace" ]; then
|
|
set +x
|
|
trap - EXIT
|
|
rm check-names.err
|
|
fi
|
|
|
|
printf "\nOverall: "
|
|
if [ "$FAIL" -eq 0 ]; then
|
|
rm macros actual-macros enum-consts identifiers exported-symbols
|
|
echo "PASSED"
|
|
exit 0
|
|
else
|
|
echo "FAILED"
|
|
exit 1
|
|
fi
|