diff options
| author | Eric Richter <erichte@linux.ibm.com> | 2020-10-01 20:54:19 -0500 |
|---|---|---|
| committer | Oliver O'Halloran <oohall@gmail.com> | 2020-10-02 12:02:50 +1000 |
| commit | d29b77d95b7921805a9300f851af071d50d1da5c (patch) | |
| tree | 032aa101fddd6217302c813a572df91d7daeca7b | |
| parent | 5e686a75b31ba099cdfd996709532b4bf3449126 (diff) | |
| download | skiboot-d29b77d95b7921805a9300f851af071d50d1da5c.zip skiboot-d29b77d95b7921805a9300f851af071d50d1da5c.tar.gz skiboot-d29b77d95b7921805a9300f851af071d50d1da5c.tar.bz2 | |
secvar/test: use mbedtls cflags when building the test binaries
The edk2 test file includes some mbedtls files directly, make sure that
those also include the correct mbedtls config file.
Without this, the default config file is used, which conflicts with the
version we build as part of skiboot.
As host libc includes a SIZE_MAX macro, this also changes the SIZE_MAX
macro defined in mbedtls_config.h (needed for some mbedtls functions) to
only be defined if it isn't already.
Signed-off-by: Eric Richter <erichte@linux.ibm.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
| -rw-r--r-- | libstb/crypto/mbedtls-config.h | 2 | ||||
| -rw-r--r-- | libstb/secvar/test/Makefile.check | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libstb/crypto/mbedtls-config.h b/libstb/crypto/mbedtls-config.h index 9560993..e0c358d 100644 --- a/libstb/crypto/mbedtls-config.h +++ b/libstb/crypto/mbedtls-config.h @@ -86,7 +86,9 @@ /* Settings to reduce/remove warnings */ #define MBEDTLS_MPI_WINDOW_SIZE 3 // (max/default is 6) Increase for speed, may introduce warnings #define MBEDTLS_MPI_MAX_SIZE 512 // (default is 1024) increase for more bits in user-MPIs +#ifndef SIZE_MAX #define SIZE_MAX 65535 // this might need to be in libc? +#endif /* Disableable to mitigate warnings */ //#define MBEDTLS_ASN1_WRITE_C // Expects SIZE_MAX diff --git a/libstb/secvar/test/Makefile.check b/libstb/secvar/test/Makefile.check index 1e23703..6cb1687 100644 --- a/libstb/secvar/test/Makefile.check +++ b/libstb/secvar/test/Makefile.check @@ -40,10 +40,10 @@ HOST_MBEDTLS_CFLAGS+= -Wno-unused-function -Wno-suggest-attribute=const $(SECVAR_TEST) : core/test/stubs.o $(SECVAR_TEST) : % : %.c $(HOST_MBEDTLS_OBJS) - $(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -O0 -g -I include -I . -I libfdt -o $@ $< $(HOST_MBEDTLS_OBJS) core/test/stubs.o, $<) + $(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) $(HOST_MBEDTLS_CFLAGS) -O0 -g -I include -I . -I libfdt -o $@ $< $(HOST_MBEDTLS_OBJS) core/test/stubs.o, $<) $(SECVAR_TEST:%=%-gcov): %-gcov : %.c % $(HOST_MBEDTLS_OBJS) - $(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) $(HOSTGCOVCFLAGS) -I include -I . -I libfdt -lgcov -o $@ $< $(HOST_MBEDTLS_OBJS) core/test/stubs.o, $<) + $(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) $(HOSTGCOVCFLAGS) $(HOST_MBEDTLS_CFLAGS) -I include -I . -I libfdt -lgcov -o $@ $< $(HOST_MBEDTLS_OBJS) core/test/stubs.o, $<) -include $(wildcard libstb/secvar/test/*.d) |