From 013bffe5a711e877bef42587ab5862d1d8e11c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Fri, 13 Feb 2015 14:09:44 +0000 Subject: [PATCH] Style: add spaces before line continuation --- include/polarssl/check_config.h | 4 ++-- programs/aes/aescrypt2.c | 4 ++-- programs/aes/crypt_and_hash.c | 4 ++-- programs/pkey/dh_client.c | 6 +++--- programs/pkey/dh_genprime.c | 4 ++-- programs/pkey/dh_server.c | 6 +++--- programs/pkey/ecdsa.c | 2 +- programs/pkey/gen_key.c | 2 +- programs/pkey/key_app.c | 2 +- programs/pkey/pk_decrypt.c | 4 ++-- programs/pkey/pk_encrypt.c | 4 ++-- programs/pkey/pk_sign.c | 6 +++--- programs/pkey/pk_verify.c | 4 ++-- programs/pkey/rsa_decrypt.c | 4 ++-- programs/pkey/rsa_encrypt.c | 4 ++-- programs/pkey/rsa_genkey.c | 4 ++-- programs/pkey/rsa_sign.c | 2 +- programs/pkey/rsa_sign_pss.c | 6 +++--- programs/pkey/rsa_verify.c | 2 +- programs/pkey/rsa_verify_pss.c | 4 ++-- programs/random/gen_random_ctr_drbg.c | 4 ++-- programs/ssl/ssl_client1.c | 6 +++--- programs/ssl/ssl_client2.c | 4 ++-- programs/ssl/ssl_fork_server.c | 12 ++++++------ programs/ssl/ssl_mail_client.c | 2 +- programs/ssl/ssl_pthread_server.c | 10 +++++----- programs/ssl/ssl_server2.c | 6 +++--- programs/test/o_p_test.c | 2 +- programs/test/ssl_cert_test.c | 2 +- programs/test/ssl_test.c | 8 ++++---- programs/x509/cert_app.c | 8 ++++---- programs/x509/cert_write.c | 6 +++--- programs/x509/crl_app.c | 2 +- programs/x509/req_app.c | 2 +- 34 files changed, 76 insertions(+), 76 deletions(-) diff --git a/include/polarssl/check_config.h b/include/polarssl/check_config.h index 51b124d6d..db7d76bef 100644 --- a/include/polarssl/check_config.h +++ b/include/polarssl/check_config.h @@ -145,13 +145,13 @@ #endif #if defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED) && \ - ( !defined(POLARSSL_RSA_C) || !defined(POLARSSL_X509_CRT_PARSE_C) ||\ + ( !defined(POLARSSL_RSA_C) || !defined(POLARSSL_X509_CRT_PARSE_C) || \ !defined(POLARSSL_PKCS1_V15) ) #error "POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED defined, but not all prerequisites" #endif #if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED) && \ - ( !defined(POLARSSL_RSA_C) || !defined(POLARSSL_X509_CRT_PARSE_C) ||\ + ( !defined(POLARSSL_RSA_C) || !defined(POLARSSL_X509_CRT_PARSE_C) || \ !defined(POLARSSL_PKCS1_V15) ) #error "POLARSSL_KEY_EXCHANGE_RSA_ENABLED defined, but not all prerequisites" #endif diff --git a/programs/aes/aescrypt2.c b/programs/aes/aescrypt2.c index 9e41c5984..430b87f20 100644 --- a/programs/aes/aescrypt2.c +++ b/programs/aes/aescrypt2.c @@ -34,7 +34,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_AES_C) && defined(POLARSSL_SHA256_C) &&\ +#if defined(POLARSSL_AES_C) && defined(POLARSSL_SHA256_C) && \ defined(POLARSSL_FS_IO) #include "polarssl/aes.h" #include "polarssl/sha256.h" @@ -63,7 +63,7 @@ "\n example: aescrypt2 0 file file.aes hex:E76B2413958B00E193\n" \ "\n" -#if !defined(POLARSSL_AES_C) || !defined(POLARSSL_SHA256_C) ||\ +#if !defined(POLARSSL_AES_C) || !defined(POLARSSL_SHA256_C) || \ !defined(POLARSSL_FS_IO) int main( void ) { diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c index 85a144b75..dfba7eb16 100644 --- a/programs/aes/crypt_and_hash.c +++ b/programs/aes/crypt_and_hash.c @@ -35,7 +35,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_CIPHER_C) && defined(POLARSSL_MD_C) &&\ +#if defined(POLARSSL_CIPHER_C) && defined(POLARSSL_MD_C) && \ defined(POLARSSL_FS_IO) #include "polarssl/cipher.h" #include "polarssl/md.h" @@ -64,7 +64,7 @@ "\n example: crypt_and_hash 0 file file.aes AES-128-CBC SHA1 hex:E76B2413958B00E193\n" \ "\n" -#if !defined(POLARSSL_CIPHER_C) || !defined(POLARSSL_MD_C) ||\ +#if !defined(POLARSSL_CIPHER_C) || !defined(POLARSSL_MD_C) || \ !defined(POLARSSL_FS_IO) int main( void ) { diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c index a29da4b03..6c77a561d 100644 --- a/programs/pkey/dh_client.c +++ b/programs/pkey/dh_client.c @@ -33,9 +33,9 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_AES_C) && defined(POLARSSL_DHM_C) &&\ - defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_NET_C) &&\ - defined(POLARSSL_RSA_C) && defined(POLARSSL_SHA256_C) &&\ +#if defined(POLARSSL_AES_C) && defined(POLARSSL_DHM_C) && \ + defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_NET_C) && \ + defined(POLARSSL_RSA_C) && defined(POLARSSL_SHA256_C) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_CTR_DRBG_C) #include "polarssl/net.h" #include "polarssl/aes.h" diff --git a/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c index a3d574c76..e0ca260e5 100644 --- a/programs/pkey/dh_genprime.c +++ b/programs/pkey/dh_genprime.c @@ -33,8 +33,8 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) &&\ - defined(POLARSSL_FS_IO) && defined(POLARSSL_CTR_DRBG_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \ + defined(POLARSSL_FS_IO) && defined(POLARSSL_CTR_DRBG_C) && \ defined(POLARSSL_GENPRIME) #include "polarssl/bignum.h" #include "polarssl/entropy.h" diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c index 197e4f2d0..e824902b3 100644 --- a/programs/pkey/dh_server.c +++ b/programs/pkey/dh_server.c @@ -33,9 +33,9 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_AES_C) && defined(POLARSSL_DHM_C) &&\ - defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_NET_C) &&\ - defined(POLARSSL_RSA_C) && defined(POLARSSL_SHA256_C) &&\ +#if defined(POLARSSL_AES_C) && defined(POLARSSL_DHM_C) && \ + defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_NET_C) && \ + defined(POLARSSL_RSA_C) && defined(POLARSSL_SHA256_C) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_CTR_DRBG_C) #include "polarssl/net.h" #include "polarssl/aes.h" diff --git a/programs/pkey/ecdsa.c b/programs/pkey/ecdsa.c index ecbe15a19..640d3e76a 100644 --- a/programs/pkey/ecdsa.c +++ b/programs/pkey/ecdsa.c @@ -33,7 +33,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_ECDSA_C) &&\ +#if defined(POLARSSL_ECDSA_C) && \ defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_CTR_DRBG_C) #include "polarssl/entropy.h" #include "polarssl/ctr_drbg.h" diff --git a/programs/pkey/gen_key.c b/programs/pkey/gen_key.c index d047d71ce..a4095da51 100644 --- a/programs/pkey/gen_key.c +++ b/programs/pkey/gen_key.c @@ -33,7 +33,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_PK_WRITE_C) && defined(POLARSSL_FS_IO) &&\ +#if defined(POLARSSL_PK_WRITE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_CTR_DRBG_C) #include "polarssl/error.h" #include "polarssl/pk.h" diff --git a/programs/pkey/key_app.c b/programs/pkey/key_app.c index 7c01caf4e..2ebeb41b4 100644 --- a/programs/pkey/key_app.c +++ b/programs/pkey/key_app.c @@ -33,7 +33,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && \ defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_FS_IO) #include "polarssl/error.h" #include "polarssl/rsa.h" diff --git a/programs/pkey/pk_decrypt.c b/programs/pkey/pk_decrypt.c index c53e7ef34..2bd8b3486 100644 --- a/programs/pkey/pk_decrypt.c +++ b/programs/pkey/pk_decrypt.c @@ -33,8 +33,8 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_PK_PARSE_C) &&\ - defined(POLARSSL_FS_IO) && defined(POLARSSL_ENTROPY_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_PK_PARSE_C) && \ + defined(POLARSSL_FS_IO) && defined(POLARSSL_ENTROPY_C) && \ defined(POLARSSL_CTR_DRBG_C) #include "polarssl/error.h" #include "polarssl/pk.h" diff --git a/programs/pkey/pk_encrypt.c b/programs/pkey/pk_encrypt.c index 115334341..9a3e78244 100644 --- a/programs/pkey/pk_encrypt.c +++ b/programs/pkey/pk_encrypt.c @@ -34,8 +34,8 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_PK_PARSE_C) &&\ - defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_PK_PARSE_C) && \ + defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_CTR_DRBG_C) #include "polarssl/error.h" #include "polarssl/pk.h" diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c index 021d154f4..162db1e98 100644 --- a/programs/pkey/pk_sign.c +++ b/programs/pkey/pk_sign.c @@ -33,9 +33,9 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) &&\ - defined(POLARSSL_SHA256_C) &&\ - defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_FS_IO) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \ + defined(POLARSSL_SHA256_C) && \ + defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_CTR_DRBG_C) #include "polarssl/error.h" #include "polarssl/entropy.h" diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c index 1bfb66f1c..6f8755bd1 100644 --- a/programs/pkey/pk_verify.c +++ b/programs/pkey/pk_verify.c @@ -33,8 +33,8 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) &&\ - defined(POLARSSL_SHA256_C) && defined(POLARSSL_PK_PARSE_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && \ + defined(POLARSSL_SHA256_C) && defined(POLARSSL_PK_PARSE_C) && \ defined(POLARSSL_FS_IO) #include "polarssl/error.h" #include "polarssl/md.h" diff --git a/programs/pkey/rsa_decrypt.c b/programs/pkey/rsa_decrypt.c index e7606929b..368089f76 100644 --- a/programs/pkey/rsa_decrypt.c +++ b/programs/pkey/rsa_decrypt.c @@ -33,8 +33,8 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) &&\ - defined(POLARSSL_FS_IO) && defined(POLARSSL_ENTROPY_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ + defined(POLARSSL_FS_IO) && defined(POLARSSL_ENTROPY_C) && \ defined(POLARSSL_CTR_DRBG_C) #include "polarssl/rsa.h" #include "polarssl/entropy.h" diff --git a/programs/pkey/rsa_encrypt.c b/programs/pkey/rsa_encrypt.c index afef96dc4..bbf7678c3 100644 --- a/programs/pkey/rsa_encrypt.c +++ b/programs/pkey/rsa_encrypt.c @@ -34,8 +34,8 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) &&\ - defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ + defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_CTR_DRBG_C) #include "polarssl/rsa.h" #include "polarssl/entropy.h" diff --git a/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c index d38545922..f1be5367e 100644 --- a/programs/pkey/rsa_genkey.c +++ b/programs/pkey/rsa_genkey.c @@ -33,8 +33,8 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) &&\ - defined(POLARSSL_RSA_C) && defined(POLARSSL_GENPRIME) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \ + defined(POLARSSL_RSA_C) && defined(POLARSSL_GENPRIME) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_CTR_DRBG_C) #include "polarssl/entropy.h" #include "polarssl/ctr_drbg.h" diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c index 0693a36f5..f033eab4c 100644 --- a/programs/pkey/rsa_sign.c +++ b/programs/pkey/rsa_sign.c @@ -34,7 +34,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_SHA256_C) && defined(POLARSSL_FS_IO) #include "polarssl/rsa.h" #include "polarssl/sha1.h" diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c index 45b7364cf..be42ad18f 100644 --- a/programs/pkey/rsa_sign_pss.c +++ b/programs/pkey/rsa_sign_pss.c @@ -33,9 +33,9 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) &&\ - defined(POLARSSL_RSA_C) && defined(POLARSSL_SHA256_C) &&\ - defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_FS_IO) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \ + defined(POLARSSL_RSA_C) && defined(POLARSSL_SHA256_C) && \ + defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_CTR_DRBG_C) #include "polarssl/entropy.h" #include "polarssl/ctr_drbg.h" diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c index c43fc305f..88d4d04c4 100644 --- a/programs/pkey/rsa_verify.c +++ b/programs/pkey/rsa_verify.c @@ -33,7 +33,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_SHA256_C) && defined(POLARSSL_FS_IO) #include "polarssl/rsa.h" #include "polarssl/sha1.h" diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c index c313512c8..d679a58ff 100644 --- a/programs/pkey/rsa_verify_pss.c +++ b/programs/pkey/rsa_verify_pss.c @@ -33,8 +33,8 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) &&\ - defined(POLARSSL_SHA256_C) && defined(POLARSSL_PK_PARSE_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ + defined(POLARSSL_SHA256_C) && defined(POLARSSL_PK_PARSE_C) && \ defined(POLARSSL_FS_IO) #include "polarssl/md.h" #include "polarssl/pem.h" diff --git a/programs/random/gen_random_ctr_drbg.c b/programs/random/gen_random_ctr_drbg.c index acd0778de..4c2286d98 100644 --- a/programs/random/gen_random_ctr_drbg.c +++ b/programs/random/gen_random_ctr_drbg.c @@ -34,7 +34,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_CTR_DRBG_C) && defined(POLARSSL_ENTROPY_C) &&\ +#if defined(POLARSSL_CTR_DRBG_C) && defined(POLARSSL_ENTROPY_C) && \ defined(POLARSSL_FS_IO) #include "polarssl/entropy.h" #include "polarssl/ctr_drbg.h" @@ -42,7 +42,7 @@ #include #endif -#if !defined(POLARSSL_CTR_DRBG_C) || !defined(POLARSSL_ENTROPY_C) ||\ +#if !defined(POLARSSL_CTR_DRBG_C) || !defined(POLARSSL_ENTROPY_C) || \ !defined(POLARSSL_FS_IO) int main( void ) { diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c index bbb841091..25554f41d 100644 --- a/programs/ssl/ssl_client1.c +++ b/programs/ssl/ssl_client1.c @@ -34,9 +34,9 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) &&\ - defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_CLI_C) &&\ - defined(POLARSSL_NET_C) && defined(POLARSSL_RSA_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \ + defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_CLI_C) && \ + defined(POLARSSL_NET_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_CTR_DRBG_C) && defined(POLARSSL_X509_CRT_PARSE_C) #include "polarssl/net.h" #include "polarssl/debug.h" diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index 32a55b62b..e0ba186fc 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -34,8 +34,8 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) &&\ - defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_CLI_C) &&\ +#if defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) && \ + defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_CLI_C) && \ defined(POLARSSL_NET_C) && defined(POLARSSL_CTR_DRBG_C) #include "polarssl/net.h" #include "polarssl/ssl.h" diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c index 2bdf3f600..3f3c6ade8 100644 --- a/programs/ssl/ssl_fork_server.c +++ b/programs/ssl/ssl_fork_server.c @@ -38,11 +38,11 @@ #include #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_CERTS_C) &&\ - defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_SSL_TLS_C) &&\ - defined(POLARSSL_SSL_SRV_C) && defined(POLARSSL_NET_C) &&\ - defined(POLARSSL_RSA_C) && defined(POLARSSL_CTR_DRBG_C) &&\ - defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_TIMING_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_CERTS_C) && \ + defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_SSL_TLS_C) && \ + defined(POLARSSL_SSL_SRV_C) && defined(POLARSSL_NET_C) && \ + defined(POLARSSL_RSA_C) && defined(POLARSSL_CTR_DRBG_C) && \ + defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_TIMING_C) && \ defined(POLARSSL_FS_IO) #include "polarssl/entropy.h" #include "polarssl/ctr_drbg.h" @@ -70,7 +70,7 @@ !defined(POLARSSL_ENTROPY_C) || !defined(POLARSSL_SSL_TLS_C) || \ !defined(POLARSSL_SSL_SRV_C) || !defined(POLARSSL_NET_C) || \ !defined(POLARSSL_RSA_C) || !defined(POLARSSL_CTR_DRBG_C) || \ - !defined(POLARSSL_X509_CRT_PARSE_C) || !defined(POLARSSL_TIMING_C) ||\ + !defined(POLARSSL_X509_CRT_PARSE_C) || !defined(POLARSSL_TIMING_C) || \ !defined(POLARSSL_FS_IO) int main( int argc, char *argv[] ) { diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c index f39a5d855..226baf578 100644 --- a/programs/ssl/ssl_mail_client.c +++ b/programs/ssl/ssl_mail_client.c @@ -128,7 +128,7 @@ #if !defined(POLARSSL_BIGNUM_C) || !defined(POLARSSL_ENTROPY_C) || \ !defined(POLARSSL_SSL_TLS_C) || !defined(POLARSSL_SSL_CLI_C) || \ !defined(POLARSSL_NET_C) || !defined(POLARSSL_RSA_C) || \ - !defined(POLARSSL_CTR_DRBG_C) || !defined(POLARSSL_X509_CRT_PARSE_C) ||\ + !defined(POLARSSL_CTR_DRBG_C) || !defined(POLARSSL_X509_CRT_PARSE_C) || \ !defined(POLARSSL_FS_IO) int main( void ) { diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c index a22548556..091d07a7b 100644 --- a/programs/ssl/ssl_pthread_server.c +++ b/programs/ssl/ssl_pthread_server.c @@ -39,11 +39,11 @@ #include #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_CERTS_C) &&\ - defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_SSL_TLS_C) &&\ - defined(POLARSSL_SSL_SRV_C) && defined(POLARSSL_NET_C) &&\ - defined(POLARSSL_RSA_C) && defined(POLARSSL_CTR_DRBG_C) &&\ - defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_FS_IO) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_CERTS_C) && \ + defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_SSL_TLS_C) && \ + defined(POLARSSL_SSL_SRV_C) && defined(POLARSSL_NET_C) && \ + defined(POLARSSL_RSA_C) && defined(POLARSSL_CTR_DRBG_C) && \ + defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_THREADING_C) && defined(POLARSSL_THREADING_PTHREAD) #include "polarssl/entropy.h" #include "polarssl/ctr_drbg.h" diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index cebf3bffd..bf90c10bb 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -44,8 +44,8 @@ #include #endif -#if defined(POLARSSL_ENTROPY_C) &&\ - defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_SRV_C) &&\ +#if defined(POLARSSL_ENTROPY_C) && \ + defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_SRV_C) && \ defined(POLARSSL_NET_C) && defined(POLARSSL_CTR_DRBG_C) #include "polarssl/net.h" #include "polarssl/ssl.h" @@ -278,7 +278,7 @@ " force_ciphersuite= default: all enabled\n" \ " acceptable ciphersuite names:\n" -#if !defined(POLARSSL_ENTROPY_C) ||\ +#if !defined(POLARSSL_ENTROPY_C) || \ !defined(POLARSSL_SSL_TLS_C) || !defined(POLARSSL_SSL_SRV_C) || \ !defined(POLARSSL_NET_C) || !defined(POLARSSL_CTR_DRBG_C) #include diff --git a/programs/test/o_p_test.c b/programs/test/o_p_test.c index 3e77c55c9..0d1cccfa0 100644 --- a/programs/test/o_p_test.c +++ b/programs/test/o_p_test.c @@ -33,7 +33,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_FS_IO) #include diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c index 2b1d5a7b0..393651fca 100644 --- a/programs/test/ssl_cert_test.c +++ b/programs/test/ssl_cert_test.c @@ -33,7 +33,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_RSA_C) && defined(POLARSSL_X509_CRT_PARSE_C) &&\ +#if defined(POLARSSL_RSA_C) && defined(POLARSSL_X509_CRT_PARSE_C) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_X509_CRL_PARSE_C) #include "polarssl/certs.h" #include "polarssl/x509_crt.h" diff --git a/programs/test/ssl_test.c b/programs/test/ssl_test.c index 7d24c0be2..1aa7ee17e 100644 --- a/programs/test/ssl_test.c +++ b/programs/test/ssl_test.c @@ -36,10 +36,10 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) &&\ - defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_SRV_C) &&\ - defined(POLARSSL_SSL_CLI_C) && defined(POLARSSL_NET_C) &&\ - defined(POLARSSL_RSA_C) && defined(POLARSSL_CTR_DRBG_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \ + defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_SRV_C) && \ + defined(POLARSSL_SSL_CLI_C) && defined(POLARSSL_NET_C) && \ + defined(POLARSSL_RSA_C) && defined(POLARSSL_CTR_DRBG_C) && \ defined(POLARSSL_X509_CRT_PARSE_C) #include "polarssl/net.h" #include "polarssl/ssl.h" diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c index d74b4daf7..dc541d3d0 100644 --- a/programs/x509/cert_app.c +++ b/programs/x509/cert_app.c @@ -34,10 +34,10 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) &&\ - defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_CLI_C) &&\ - defined(POLARSSL_NET_C) && defined(POLARSSL_RSA_C) &&\ - defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_FS_IO) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \ + defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_CLI_C) && \ + defined(POLARSSL_NET_C) && defined(POLARSSL_RSA_C) && \ + defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_CTR_DRBG_C) #include "polarssl/entropy.h" #include "polarssl/ctr_drbg.h" diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c index ed6f218da..cbcd3594b 100644 --- a/programs/x509/cert_write.c +++ b/programs/x509/cert_write.c @@ -33,9 +33,9 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_X509_CRT_WRITE_C) &&\ - defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_FS_IO) &&\ - defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_CTR_DRBG_C) &&\ +#if defined(POLARSSL_X509_CRT_WRITE_C) && \ + defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_FS_IO) && \ + defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_CTR_DRBG_C) && \ defined(POLARSSL_ERROR_C) #include "polarssl/x509_crt.h" #include "polarssl/x509_csr.h" diff --git a/programs/x509/crl_app.c b/programs/x509/crl_app.c index 06395668c..83543911b 100644 --- a/programs/x509/crl_app.c +++ b/programs/x509/crl_app.c @@ -33,7 +33,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_X509_CRL_PARSE_C) && defined(POLARSSL_FS_IO) #include "polarssl/x509_crl.h" diff --git a/programs/x509/req_app.c b/programs/x509/req_app.c index 2058e4c43..0b070fc97 100644 --- a/programs/x509/req_app.c +++ b/programs/x509/req_app.c @@ -33,7 +33,7 @@ #define polarssl_printf printf #endif -#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) &&\ +#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_X509_CSR_PARSE_C) && defined(POLARSSL_FS_IO) #include "polarssl/x509_csr.h"