Move programs from mbedtls to framework #9939
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit moves demo_common.sh and dlopen_demo.sh from MbedTLS to MbedTLS-framework. Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
Harry-Ramsey
force-pushed
the
move-programs-from-mbedtls-to-framework
branch
2 times, most recently
from
2abee45 to
febf47b
Compare
This commit updates the file paths necessary for dlopen_demo.sh, metatest.c query_compile_time_config.c, query_config.h, query_included_headers.c and zeroize.c. Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
This commit updates the include headers for moved program files whilst also adding the -I flag for compiler to locate the moved headers in MbedTLS-Framework. Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
Harry-Ramsey
force-pushed
the
move-programs-from-mbedtls-to-framework
branch
from
febf47b to
fab23f5
Compare
ronald-cron-arm
requested changes
Feb 6, 2025
Comment on lines
+81
to
+83
| $(FRAMEWORK)/tests/programs/metatest \ | ||
| $(FRAMEWORK)/tests/programs/query_compile_time_config \ | ||
| $(FRAMEWORK)/tests/programs/query_included_headers \ |
There was a problem hiding this comment.
Suggested change
| $(FRAMEWORK)/tests/programs/metatest \ | |
| $(FRAMEWORK)/tests/programs/query_compile_time_config \ | |
| $(FRAMEWORK)/tests/programs/query_included_headers \ | |
| test/metatest \ | |
| test/query_compile_time_config \ | |
| test/query_included_headers \ |
we want to keep the executables in programs/test.
| test/selftest \ | ||
| test/udp_proxy \ | ||
| test/zeroize \ | ||
| $(FRAMEWORK)/tests/programs/zeroize \ |
There was a problem hiding this comment.
Suggested change
| $(FRAMEWORK)/tests/programs/zeroize \ | |
| test/zeroize \ |
| ssl/ssl_test_lib.h \ | ||
| ssl/ssl_test_common_source.c \ | ||
| $(DEP) | ||
|
|
||
| ssl/ssl_test_lib.o: ssl/ssl_test_lib.c ssl/ssl_test_lib.h $(DEP) | ||
| echo " CC ssl/ssl_test_lib.c" | ||
| $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -c ssl/ssl_test_lib.c -o $@ | ||
| $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -I$(FRAMEWORK)/tests/programs/ -c ssl/ssl_test_lib.c -o $@ |
There was a problem hiding this comment.
I'd rather add it to LOCAL_CFLAGS. In line 10, something like:
LOCAL_CFLAGS += -I${FRAMEWORK}/tests/programs
| ssl/ssl_test_lib.h \ | ||
| ssl/ssl_test_common_source.c \ | ||
| $(DEP) | ||
|
|
||
| ssl/ssl_test_lib.o: ssl/ssl_test_lib.c ssl/ssl_test_lib.h $(DEP) | ||
| echo " CC ssl/ssl_test_lib.c" | ||
| $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -c ssl/ssl_test_lib.c -o $@ | ||
| $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -I$(FRAMEWORK)/tests/programs/ -c ssl/ssl_test_lib.c -o $@ |
There was a problem hiding this comment.
Suggested change
| $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -I$(FRAMEWORK)/tests/programs/ -c ssl/ssl_test_lib.c -o $@ | |
| $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -c ssl/ssl_test_lib.c -o $@ |
ditto for the other occurences
| echo " CC test/metatest.c" | ||
| $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -I../library -I../tf-psa-crypto/core test/metatest.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ | ||
| $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -I../include -I../library -I../tf-psa-crypto/core $(FRAMEWORK)/tests/programs/metatest.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ |
There was a problem hiding this comment.
Suggested change
| $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -I../include -I../library -I../tf-psa-crypto/core $(FRAMEWORK)/tests/programs/metatest.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ | |
| $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -I../library -I../tf-psa-crypto/core $(FRAMEWORK)/tests/programs/metatest.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ |
the issue with the compilation of metatest was not in this rule but the fact that there was no rule for the target ${FRAMEWORK}/tests/programs/metatest thus an implicit rule (lovely make build system...) was used without the necessary paths to search for the headers.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Move program files to MbedTLS-Framework. Closes #112.
PR checklist
Please remove the segment/s on either side of the | symbol as appropriate, and add any relevant link/s to the end of the line.
If the provided content is part of the present PR remove the # symbol.
Notes for the submitter
Please refer to the contributing guidelines, especially the
checklist for PR contributors.
Help make review efficient: