Merge branch 'development' into dtls
* development: (100 commits)
Update Changelog for the mem-measure branch
Fix issues introduced when rebasing
Fix compile error in memory_buffer_alloc_selftest
Code cosmetics
Add curve25519 to ecc-heap.sh
Add curve25519 to the benchmark program
Fix compile issue when buffer_alloc not available
New script ecc-heap.sh
Fix unused variable issue in some configs
Rm usunused member in private struct
Add heap usage for PK in benchmark
Use memory_buffer_alloc() in benchmark if available
Only define mode_func if mode is enabled (CBC etc)
PKCS8 encrypted key depend on PKCS5 or PKCS12
Disable SRV_C for client measurement
Output stack+heap usage with massif
Enable NIST_OPTIM by default for config-suite-b
Refactor memory.sh
Adapt memory.sh to config-suite-b
Adapt mini-client for config-suite-b.h
...
Conflicts:
ChangeLog
include/polarssl/net.h
library/Makefile
library/error.c
library/ssl_tls.c
programs/Makefile
programs/ssl/ssl_client2.c
programs/ssl/ssl_server2.c
tests/Makefile
diff --git a/tests/Makefile b/tests/Makefile
index 0bd6ee9..408e953 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -7,22 +7,36 @@
-Wno-unused-function -Wno-unused-value
OFLAGS = -O2
-LDFLAGS += -L../library -lmbedtls $(SYS_LDFLAGS)
+LDFLAGS += -L../library -lmbedtls$(SHARED_SUFFIX) $(SYS_LDFLAGS)
+DLEXT=so
ifndef SHARED
DEP=../library/libmbedtls.a
CHECK_PRELOAD=
else
-DEP=../library/libmbedtls.so
-CHECK_PRELOAD= LD_PRELOAD=../library/libmbedtls.so
+DEP=../library/libmbedtls.$(DLEXT)
+CHECK_PRELOAD= LD_PRELOAD=../library/libmbedtls.$(DLEXT)
endif
ifdef DEBUG
CFLAGS += -g3
endif
+#
+# if we running on Windows build
+# for Windows
+#
ifdef WINDOWS
+WINDOWS_BUILD=1
+endif
+
+ifdef WINDOWS_BUILD
+DLEXT=dll
+EXEXT=.exe
LDFLAGS += -lws2_32
+ifdef SHARED
+SHARED_SUFFIX=.$(DLEXT)
+endif
endif
# Zlib shared library extensions:
@@ -30,45 +44,45 @@
LDFLAGS += -lz
endif
-APPS = test_suite_aes.ecb test_suite_aes.cbc \
- test_suite_aes.cfb test_suite_aes.rest \
- test_suite_arc4 test_suite_asn1write \
- test_suite_base64 test_suite_blowfish \
- test_suite_camellia test_suite_ccm \
- test_suite_cipher.aes \
- test_suite_cipher.arc4 test_suite_cipher.ccm \
- test_suite_cipher.gcm \
- test_suite_cipher.blowfish \
- test_suite_cipher.camellia \
- test_suite_cipher.des test_suite_cipher.null \
- test_suite_cipher.padding \
- test_suite_ctr_drbg test_suite_debug \
- test_suite_des test_suite_dhm \
- test_suite_ecdh test_suite_ecdsa \
- test_suite_ecp \
- test_suite_error test_suite_entropy \
- test_suite_gcm.aes128_de \
- test_suite_gcm.aes192_de \
- test_suite_gcm.aes256_de \
- test_suite_gcm.aes128_en \
- test_suite_gcm.aes192_en \
- test_suite_gcm.aes256_en \
- test_suite_gcm.camellia test_suite_hmac_shax \
- test_suite_hmac_drbg.misc \
- test_suite_hmac_drbg.no_reseed \
- test_suite_hmac_drbg.nopr \
- test_suite_hmac_drbg.pr \
- test_suite_md test_suite_mdx \
- test_suite_memory_buffer_alloc \
- test_suite_mpi test_suite_pbkdf2 \
- test_suite_pem \
- test_suite_pkcs1_v21 test_suite_pkcs5 \
- test_suite_pkparse test_suite_pkwrite \
- test_suite_pk \
- test_suite_rsa test_suite_shax \
- test_suite_ssl \
- test_suite_x509parse test_suite_x509write \
- test_suite_xtea test_suite_version
+APPS = test_suite_aes.ecb$(EXEXT) test_suite_aes.cbc$(EXEXT) \
+ test_suite_aes.cfb$(EXEXT) test_suite_aes.rest$(EXEXT) \
+ test_suite_arc4$(EXEXT) test_suite_asn1write$(EXEXT) \
+ test_suite_base64$(EXEXT) test_suite_blowfish$(EXEXT) \
+ test_suite_camellia$(EXEXT) test_suite_ccm$(EXEXT) \
+ test_suite_cipher.aes$(EXEXT) \
+ test_suite_cipher.arc4$(EXEXT) test_suite_cipher.ccm$(EXEXT) \
+ test_suite_cipher.gcm$(EXEXT) \
+ test_suite_cipher.blowfish$(EXEXT) \
+ test_suite_cipher.camellia$(EXEXT) \
+ test_suite_cipher.des$(EXEXT) test_suite_cipher.null$(EXEXT) \
+ test_suite_cipher.padding$(EXEXT) \
+ test_suite_ctr_drbg$(EXEXT) test_suite_debug$(EXEXT) \
+ test_suite_des$(EXEXT) test_suite_dhm$(EXEXT) \
+ test_suite_ecdh$(EXEXT) test_suite_ecdsa$(EXEXT) \
+ test_suite_ecp$(EXEXT) \
+ test_suite_error$(EXEXT) test_suite_entropy$(EXEXT) \
+ test_suite_gcm.aes128_de$(EXEXT) \
+ test_suite_gcm.aes192_de$(EXEXT) \
+ test_suite_gcm.aes256_de$(EXEXT) \
+ test_suite_gcm.aes128_en$(EXEXT) \
+ test_suite_gcm.aes192_en$(EXEXT) \
+ test_suite_gcm.aes256_en$(EXEXT) \
+ test_suite_gcm.camellia$(EXEXT) test_suite_hmac_shax$(EXEXT) \
+ test_suite_hmac_drbg.misc$(EXEXT) \
+ test_suite_hmac_drbg.no_reseed$(EXEXT) \
+ test_suite_hmac_drbg.nopr$(EXEXT) \
+ test_suite_hmac_drbg.pr$(EXEXT) \
+ test_suite_md$(EXEXT) test_suite_mdx$(EXEXT) \
+ test_suite_memory_buffer_alloc$(EXEXT) \
+ test_suite_mpi$(EXEXT) test_suite_pbkdf2$(EXEXT) \
+ test_suite_pem$(EXEXT) \
+ test_suite_pkcs1_v21$(EXEXT) test_suite_pkcs5$(EXEXT) \
+ test_suite_pkparse$(EXEXT) test_suite_pkwrite$(EXEXT) \
+ test_suite_pk$(EXEXT) \
+ test_suite_rsa$(EXEXT) test_suite_shax$(EXEXT) \
+ test_suite_ssl$(EXEXT) \
+ test_suite_x509parse$(EXEXT) test_suite_x509write$(EXEXT) \
+ test_suite_xtea$(EXEXT) test_suite_version$(EXEXT)
.SILENT:
@@ -174,237 +188,237 @@
echo " Generate $@"
scripts/generate_code.pl suites $* $*
-test_suite_aes.ecb: test_suite_aes.ecb.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_aes.ecb$(EXEXT): test_suite_aes.ecb.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_aes.cbc: test_suite_aes.cbc.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_aes.cbc$(EXEXT): test_suite_aes.cbc.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_aes.cfb: test_suite_aes.cfb.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_aes.cfb$(EXEXT): test_suite_aes.cfb.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_aes.rest: test_suite_aes.rest.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_aes.rest$(EXEXT): test_suite_aes.rest.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_arc4: test_suite_arc4.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_arc4$(EXEXT): test_suite_arc4.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_asn1write: test_suite_asn1write.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_asn1write$(EXEXT): test_suite_asn1write.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_base64: test_suite_base64.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_base64$(EXEXT): test_suite_base64.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_blowfish: test_suite_blowfish.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_blowfish$(EXEXT): test_suite_blowfish.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_camellia: test_suite_camellia.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_camellia$(EXEXT): test_suite_camellia.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_ccm: test_suite_ccm.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_ccm$(EXEXT): test_suite_ccm.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_cipher.aes: test_suite_cipher.aes.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_cipher.aes$(EXEXT): test_suite_cipher.aes.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_cipher.arc4: test_suite_cipher.arc4.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_cipher.arc4$(EXEXT): test_suite_cipher.arc4.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_cipher.ccm: test_suite_cipher.ccm.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_cipher.ccm$(EXEXT): test_suite_cipher.ccm.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_cipher.gcm: test_suite_cipher.gcm.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_cipher.gcm$(EXEXT): test_suite_cipher.gcm.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_cipher.blowfish: test_suite_cipher.blowfish.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_cipher.blowfish$(EXEXT): test_suite_cipher.blowfish.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_cipher.camellia: test_suite_cipher.camellia.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_cipher.camellia$(EXEXT): test_suite_cipher.camellia.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_cipher.des: test_suite_cipher.des.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_cipher.des$(EXEXT): test_suite_cipher.des.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_cipher.null: test_suite_cipher.null.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_cipher.null$(EXEXT): test_suite_cipher.null.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_cipher.padding: test_suite_cipher.padding.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_cipher.padding$(EXEXT): test_suite_cipher.padding.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_ctr_drbg: test_suite_ctr_drbg.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_ctr_drbg$(EXEXT): test_suite_ctr_drbg.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_des: test_suite_des.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_des$(EXEXT): test_suite_des.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_dhm: test_suite_dhm.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_dhm$(EXEXT): test_suite_dhm.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_ecdh: test_suite_ecdh.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_ecdh$(EXEXT): test_suite_ecdh.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_ecdsa: test_suite_ecdsa.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_ecdsa$(EXEXT): test_suite_ecdsa.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_ecp: test_suite_ecp.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_ecp$(EXEXT): test_suite_ecp.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_entropy: test_suite_entropy.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_entropy$(EXEXT): test_suite_entropy.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_error: test_suite_error.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_error$(EXEXT): test_suite_error.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_gcm.aes128_de: test_suite_gcm.aes128_de.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_gcm.aes128_de$(EXEXT): test_suite_gcm.aes128_de.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_gcm.aes192_de: test_suite_gcm.aes192_de.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_gcm.aes192_de$(EXEXT): test_suite_gcm.aes192_de.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_gcm.aes256_de: test_suite_gcm.aes256_de.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_gcm.aes256_de$(EXEXT): test_suite_gcm.aes256_de.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_gcm.aes128_en: test_suite_gcm.aes128_en.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_gcm.aes128_en$(EXEXT): test_suite_gcm.aes128_en.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_gcm.aes192_en: test_suite_gcm.aes192_en.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_gcm.aes192_en$(EXEXT): test_suite_gcm.aes192_en.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_gcm.aes256_en: test_suite_gcm.aes256_en.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_gcm.aes256_en$(EXEXT): test_suite_gcm.aes256_en.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_gcm.camellia: test_suite_gcm.camellia.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_gcm.camellia$(EXEXT): test_suite_gcm.camellia.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_hmac_drbg.misc: test_suite_hmac_drbg.misc.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_hmac_drbg.misc$(EXEXT): test_suite_hmac_drbg.misc.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_hmac_drbg.no_reseed: test_suite_hmac_drbg.no_reseed.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_hmac_drbg.no_reseed$(EXEXT): test_suite_hmac_drbg.no_reseed.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_hmac_drbg.nopr: test_suite_hmac_drbg.nopr.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_hmac_drbg.nopr$(EXEXT): test_suite_hmac_drbg.nopr.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_hmac_drbg.pr: test_suite_hmac_drbg.pr.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_hmac_drbg.pr$(EXEXT): test_suite_hmac_drbg.pr.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_hmac_shax: test_suite_hmac_shax.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_hmac_shax$(EXEXT): test_suite_hmac_shax.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_md: test_suite_md.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_md$(EXEXT): test_suite_md.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_mdx: test_suite_mdx.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_mdx$(EXEXT): test_suite_mdx.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_memory_buffer_alloc: test_suite_memory_buffer_alloc.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_memory_buffer_alloc$(EXEXT): test_suite_memory_buffer_alloc.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_mpi: test_suite_mpi.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_mpi$(EXEXT): test_suite_mpi.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_pbkdf2: test_suite_pbkdf2.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_pbkdf2$(EXEXT): test_suite_pbkdf2.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_pem: test_suite_pem.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_pem$(EXEXT): test_suite_pem.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_pkcs1_v21: test_suite_pkcs1_v21.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_pkcs1_v21$(EXEXT): test_suite_pkcs1_v21.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_pkcs5: test_suite_pkcs5.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_pkcs5$(EXEXT): test_suite_pkcs5.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_pkparse: test_suite_pkparse.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_pkparse$(EXEXT): test_suite_pkparse.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_pkwrite: test_suite_pkwrite.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_pkwrite$(EXEXT): test_suite_pkwrite.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_pk: test_suite_pk.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_pk$(EXEXT): test_suite_pk.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_rsa: test_suite_rsa.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_rsa$(EXEXT): test_suite_rsa.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_shax: test_suite_shax.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_shax$(EXEXT): test_suite_shax.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_ssl: test_suite_ssl.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_ssl$(EXEXT): test_suite_ssl.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_x509parse: test_suite_x509parse.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_x509parse$(EXEXT): test_suite_x509parse.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_x509write: test_suite_x509write.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_x509write$(EXEXT): test_suite_x509write.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_xtea: test_suite_xtea.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_xtea$(EXEXT): test_suite_xtea.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_debug: test_suite_debug.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_debug$(EXEXT): test_suite_debug.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
-test_suite_version: test_suite_version.c $(DEP)
- echo " CC $@.c"
- $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
+test_suite_version$(EXEXT): test_suite_version.c $(DEP)
+ echo " CC $<"
+ $(CC) $(CFLAGS) $(OFLAGS) $< $(LDFLAGS) -o $@
clean:
ifndef WINDOWS
@@ -422,9 +436,9 @@
do \
echo " - $${i}"; \
RESULT=`$(CHECK_PRELOAD) ./$${i} | grep -v 'PASS$$' | grep -v -- '----' | grep -v '^$$'`; \
- FAILED=`echo $$RESULT |grep FAILED`; \
+ PASSED=`echo $$RESULT |grep PASSED`; \
echo " $$RESULT"; \
- if [ "$$FAILED" != "" ]; \
+ if [ "$$PASSED" == "" ]; \
then \
echo "**** Failed ***************"; \
RETURN=1; \