From 7c9e75a8363cc83d24f95d491c25b405fb4ca67d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Mon, 19 Jan 2015 16:07:53 +0000 Subject: [PATCH] Remove a few useless #defines --- programs/aes/aescrypt2.c | 2 -- programs/aes/crypt_and_hash.c | 2 -- programs/hash/generic_sum.c | 2 -- programs/hash/hello.c | 3 --- programs/hash/md5sum.c | 2 -- programs/hash/sha1sum.c | 2 -- programs/hash/sha2sum.c | 2 -- programs/pkey/dh_client.c | 3 --- programs/pkey/dh_genprime.c | 3 --- programs/pkey/dh_server.c | 3 --- programs/pkey/ecdsa.c | 3 --- programs/pkey/gen_key.c | 3 --- programs/pkey/key_app.c | 3 --- programs/pkey/key_app_writer.c | 3 --- programs/pkey/mpi_demo.c | 3 --- programs/pkey/pk_decrypt.c | 3 --- programs/pkey/pk_encrypt.c | 2 -- programs/pkey/pk_sign.c | 3 --- programs/pkey/pk_verify.c | 3 --- programs/pkey/rsa_decrypt.c | 3 --- programs/pkey/rsa_encrypt.c | 2 -- programs/pkey/rsa_genkey.c | 3 --- programs/pkey/rsa_sign.c | 2 -- programs/pkey/rsa_sign_pss.c | 3 --- programs/pkey/rsa_verify.c | 3 --- programs/pkey/rsa_verify_pss.c | 3 --- programs/random/gen_entropy.c | 2 -- programs/random/gen_random_ctr_drbg.c | 2 -- programs/random/gen_random_havege.c | 2 -- programs/ssl/ssl_client1.c | 2 -- programs/ssl/ssl_client2.c | 2 -- programs/ssl/ssl_fork_server.c | 2 -- programs/ssl/ssl_mail_client.c | 2 -- programs/ssl/ssl_pthread_server.c | 2 -- programs/ssl/ssl_server.c | 2 -- programs/test/benchmark.c | 3 --- programs/test/o_p_test.c | 3 --- programs/test/selftest.c | 3 --- programs/test/ssl_cert_test.c | 3 --- programs/util/pem2der.c | 1 - programs/util/strerror.c | 3 --- programs/x509/cert_app.c | 2 -- programs/x509/cert_req.c | 3 --- programs/x509/cert_write.c | 3 --- programs/x509/crl_app.c | 3 --- programs/x509/req_app.c | 3 --- 46 files changed, 117 deletions(-) diff --git a/programs/aes/aescrypt2.c b/programs/aes/aescrypt2.c index db20db456..55f925180 100644 --- a/programs/aes/aescrypt2.c +++ b/programs/aes/aescrypt2.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #if defined(_WIN32) diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c index 231849830..9e4f6967e 100644 --- a/programs/aes/crypt_and_hash.c +++ b/programs/aes/crypt_and_hash.c @@ -32,8 +32,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #if defined(_WIN32) diff --git a/programs/hash/generic_sum.c b/programs/hash/generic_sum.c index 5af63f5e7..d8c626c8f 100644 --- a/programs/hash/generic_sum.c +++ b/programs/hash/generic_sum.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/hash/hello.c b/programs/hash/hello.c index 083dc9d95..c6edf3330 100644 --- a/programs/hash/hello.c +++ b/programs/hash/hello.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/hash/md5sum.c b/programs/hash/md5sum.c index 2efe8cf29..7dc5fdbe4 100644 --- a/programs/hash/md5sum.c +++ b/programs/hash/md5sum.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/hash/sha1sum.c b/programs/hash/sha1sum.c index b5ad22353..cc5b42ef3 100644 --- a/programs/hash/sha1sum.c +++ b/programs/hash/sha1sum.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/hash/sha2sum.c b/programs/hash/sha2sum.c index aee4e63e0..659c2717a 100644 --- a/programs/hash/sha2sum.c +++ b/programs/hash/sha2sum.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c index 355810387..31250bd1e 100644 --- a/programs/pkey/dh_client.c +++ b/programs/pkey/dh_client.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c index df12e185d..8aabeedac 100644 --- a/programs/pkey/dh_genprime.c +++ b/programs/pkey/dh_genprime.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c index b9b3a50d8..8c93ba1e1 100644 --- a/programs/pkey/dh_server.c +++ b/programs/pkey/dh_server.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/ecdsa.c b/programs/pkey/ecdsa.c index aaec2497b..f30ec487f 100644 --- a/programs/pkey/ecdsa.c +++ b/programs/pkey/ecdsa.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include "polarssl/entropy.h" diff --git a/programs/pkey/gen_key.c b/programs/pkey/gen_key.c index e96878627..2fd60d47c 100644 --- a/programs/pkey/gen_key.c +++ b/programs/pkey/gen_key.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/key_app.c b/programs/pkey/key_app.c index a161829f2..418653cce 100644 --- a/programs/pkey/key_app.c +++ b/programs/pkey/key_app.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/key_app_writer.c b/programs/pkey/key_app_writer.c index 6862835e6..dad2c13f9 100644 --- a/programs/pkey/key_app_writer.c +++ b/programs/pkey/key_app_writer.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/mpi_demo.c b/programs/pkey/mpi_demo.c index bf277fd58..93535b3ee 100644 --- a/programs/pkey/mpi_demo.c +++ b/programs/pkey/mpi_demo.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/pk_decrypt.c b/programs/pkey/pk_decrypt.c index 314aad3ec..6fcc4af14 100644 --- a/programs/pkey/pk_decrypt.c +++ b/programs/pkey/pk_decrypt.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/pk_encrypt.c b/programs/pkey/pk_encrypt.c index 9f2984939..121e3b199 100644 --- a/programs/pkey/pk_encrypt.c +++ b/programs/pkey/pk_encrypt.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c index d03269113..3f3b85f41 100644 --- a/programs/pkey/pk_sign.c +++ b/programs/pkey/pk_sign.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c index 89e9cc1be..0ceb60151 100644 --- a/programs/pkey/pk_verify.c +++ b/programs/pkey/pk_verify.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/rsa_decrypt.c b/programs/pkey/rsa_decrypt.c index 1e187a83f..215669cca 100644 --- a/programs/pkey/rsa_decrypt.c +++ b/programs/pkey/rsa_decrypt.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/rsa_encrypt.c b/programs/pkey/rsa_encrypt.c index e8c00d33d..e3cd90ad5 100644 --- a/programs/pkey/rsa_encrypt.c +++ b/programs/pkey/rsa_encrypt.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c index 955f819f7..95bc823f3 100644 --- a/programs/pkey/rsa_genkey.c +++ b/programs/pkey/rsa_genkey.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c index 27d14743b..e854f70a3 100644 --- a/programs/pkey/rsa_sign.c +++ b/programs/pkey/rsa_sign.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c index 3c9cbdb21..252bbf27d 100644 --- a/programs/pkey/rsa_sign_pss.c +++ b/programs/pkey/rsa_sign_pss.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c index 43b742edf..4e00bdde4 100644 --- a/programs/pkey/rsa_verify.c +++ b/programs/pkey/rsa_verify.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c index 3f792621a..673618446 100644 --- a/programs/pkey/rsa_verify_pss.c +++ b/programs/pkey/rsa_verify_pss.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/random/gen_entropy.c b/programs/random/gen_entropy.c index 5234f0174..f18d37951 100644 --- a/programs/random/gen_entropy.c +++ b/programs/random/gen_entropy.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include "polarssl/entropy.h" diff --git a/programs/random/gen_random_ctr_drbg.c b/programs/random/gen_random_ctr_drbg.c index 5889d1120..60c0f0142 100644 --- a/programs/random/gen_random_ctr_drbg.c +++ b/programs/random/gen_random_ctr_drbg.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include "polarssl/entropy.h" diff --git a/programs/random/gen_random_havege.c b/programs/random/gen_random_havege.c index d9b60512c..c1b420aa2 100644 --- a/programs/random/gen_random_havege.c +++ b/programs/random/gen_random_havege.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include "polarssl/havege.h" diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c index 9964936e8..c8a61c20d 100644 --- a/programs/ssl/ssl_client1.c +++ b/programs/ssl/ssl_client1.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index 247d14936..1573b8f5f 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #if !defined(POLARSSL_ENTROPY_C) || \ diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c index d1b4a6a6f..990749ef9 100644 --- a/programs/ssl/ssl_fork_server.c +++ b/programs/ssl/ssl_fork_server.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #if defined(_WIN32) diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c index 00d12ca96..31c0b6ee8 100644 --- a/programs/ssl/ssl_mail_client.c +++ b/programs/ssl/ssl_mail_client.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c index 9e59e7ce5..4a6db7aef 100644 --- a/programs/ssl/ssl_pthread_server.c +++ b/programs/ssl/ssl_pthread_server.c @@ -32,8 +32,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #if defined(_WIN32) diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c index 7c6a25584..c9360d943 100644 --- a/programs/ssl/ssl_server.c +++ b/programs/ssl/ssl_server.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #if defined(_WIN32) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index 6b505e962..7e77f6cd3 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/test/o_p_test.c b/programs/test/o_p_test.c index 6cbf299c3..ce1e522b7 100644 --- a/programs/test/o_p_test.c +++ b/programs/test/o_p_test.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/test/selftest.c b/programs/test/selftest.c index 339b07c34..301d6c322 100644 --- a/programs/test/selftest.c +++ b/programs/test/selftest.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c index 30e95c95e..c55090a97 100644 --- a/programs/test/ssl_cert_test.c +++ b/programs/test/ssl_cert_test.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/util/pem2der.c b/programs/util/pem2der.c index 95543b719..dcd3547f4 100644 --- a/programs/util/pem2der.c +++ b/programs/util/pem2der.c @@ -30,7 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf #define polarssl_malloc malloc #define polarssl_free free #endif diff --git a/programs/util/strerror.c b/programs/util/strerror.c index a4db94c86..b751ca066 100644 --- a/programs/util/strerror.c +++ b/programs/util/strerror.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c index 92b913009..b7f5950ad 100644 --- a/programs/x509/cert_app.c +++ b/programs/x509/cert_app.c @@ -31,8 +31,6 @@ #else #define polarssl_printf printf #define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c index 33c3588a8..41eaea1a4 100644 --- a/programs/x509/cert_req.c +++ b/programs/x509/cert_req.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c index c67188868..b402fb16e 100644 --- a/programs/x509/cert_write.c +++ b/programs/x509/cert_write.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/x509/crl_app.c b/programs/x509/crl_app.c index 4097554f3..8d10e3bd2 100644 --- a/programs/x509/crl_app.c +++ b/programs/x509/crl_app.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include diff --git a/programs/x509/req_app.c b/programs/x509/req_app.c index 3d8504455..bf9610af2 100644 --- a/programs/x509/req_app.c +++ b/programs/x509/req_app.c @@ -30,9 +30,6 @@ #include "polarssl/platform.h" #else #define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free #endif #include