ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12998 from sbutcher-arm/fix-adjust-config 

Fix Mbed TLS `adjust-config.sh` script
pull/13152/head
Martin Kojtal 2020-06-18 09:43:59 +02:00 committed by GitHub
parent 66343b0d25 5b0316832d
commit 0bdc712167
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
features/mbedtls/importer/adjust-config.sh
View File

@ -25,7 +25,19 @@ conf() {
$SCRIPT -f $FILE --force $@ $SCRIPT -f $FILE --force $@
} }
add_code() { # Add code before the matching line
prepend_code() {
MATCH_PATTERN="$1"
shift
CODE=$(IFS=""; printf "%s" "$*")
perl -i -pe \
"s/$MATCH_PATTERN/$CODE$MATCH_PATTERN/igs" \
"$FILE"
}
# Add code after the matching line
append_code() {
MATCH_PATTERN="$1" MATCH_PATTERN="$1"
shift shift
CODE=$(IFS=""; printf "%s" "$*") CODE=$(IFS=""; printf "%s" "$*")
@ -37,7 +49,7 @@ add_code() {
# add an #ifndef to include config-no-entropy.h when the target does not have # add an #ifndef to include config-no-entropy.h when the target does not have
# an entropy source we can use. # an entropy source we can use.
add_code \ append_code \
"#ifndef MBEDTLS_CONFIG_H\n" \ "#ifndef MBEDTLS_CONFIG_H\n" \
"\n" \ "\n" \
"#include \"platform\/inc\/platform_mbed.h\"\n" \ "#include \"platform\/inc\/platform_mbed.h\"\n" \
@ -56,8 +68,8 @@ add_code
"\n" \ "\n" \
"#else\n" "#else\n"
add_code \ prepend_code \
"#include \"mbedtls\/check_config.h\"\n" \ "#endif \/\* MBEDTLS_CONFIG_H \*\/" \
"\n" \ "\n" \
"#endif \/* !MBEDTLS_ENTROPY_HARDWARE_ALT && !MBEDTLS_TEST_NULL_ENTROPY && !MBEDTLS_ENTROPY_NV_SEED *\/\n" \ "#endif \/* !MBEDTLS_ENTROPY_HARDWARE_ALT && !MBEDTLS_TEST_NULL_ENTROPY && !MBEDTLS_ENTROPY_NV_SEED *\/\n" \
"\n" \ "\n" \
@ -70,7 +82,8 @@ add_code
" !defined(MBEDTLS_ENTROPY_HARDWARE_ALT) && !defined(MBEDTLS_ENTROPY_NV_SEED)\n" \ " !defined(MBEDTLS_ENTROPY_HARDWARE_ALT) && !defined(MBEDTLS_ENTROPY_NV_SEED)\n" \
"#error \"No entropy source was found at build time, so TLS \" \\\\\n" \ "#error \"No entropy source was found at build time, so TLS \" \\\\\n" \
" \"functionality is not available\"\n" \ " \"functionality is not available\"\n" \
"#endif\n" "#endif\n" \
"\n"
# not supported on mbed OS, nor used by mbed Client # not supported on mbed OS, nor used by mbed Client
conf unset MBEDTLS_NET_C conf unset MBEDTLS_NET_C