From ce2f2376975bc691a9a62d5f0505b1585fcbf8e6 Mon Sep 17 00:00:00 2001 From: Rich Evans Date: Fri, 6 Feb 2015 13:57:42 +0000 Subject: [PATCH] change test function includes to use one convention --- library/pem.c | 1 + tests/suites/test_suite_aes.function | 2 +- tests/suites/test_suite_arc4.function | 2 +- tests/suites/test_suite_asn1write.function | 2 +- tests/suites/test_suite_base64.function | 2 +- tests/suites/test_suite_camellia.function | 2 +- tests/suites/test_suite_ccm.function | 2 +- tests/suites/test_suite_cipher.function | 4 ++-- tests/suites/test_suite_ctr_drbg.function | 4 +--- tests/suites/test_suite_debug.function | 2 +- tests/suites/test_suite_des.function | 2 +- tests/suites/test_suite_dhm.function | 2 +- tests/suites/test_suite_ecdh.function | 2 +- tests/suites/test_suite_ecdsa.function | 2 +- tests/suites/test_suite_ecp.function | 2 +- tests/suites/test_suite_entropy.function | 2 +- tests/suites/test_suite_error.function | 2 +- tests/suites/test_suite_gcm.function | 2 +- tests/suites/test_suite_hmac_drbg.function | 4 +--- tests/suites/test_suite_hmac_shax.function | 6 +++--- tests/suites/test_suite_md.function | 2 +- tests/suites/test_suite_mdx.function | 8 ++++---- .../test_suite_memory_buffer_alloc.function | 2 +- tests/suites/test_suite_mpi.function | 2 +- tests/suites/test_suite_pbkdf2.function | 2 +- tests/suites/test_suite_pem.function | 4 ++-- tests/suites/test_suite_pk.function | 6 +++--- tests/suites/test_suite_pkcs1_v21.function | 4 ++-- tests/suites/test_suite_pkcs5.function | 2 +- tests/suites/test_suite_pkparse.function | 6 +++--- tests/suites/test_suite_pkwrite.function | 6 +++--- tests/suites/test_suite_rsa.function | 18 +++++++++--------- tests/suites/test_suite_shax.function | 6 +++--- tests/suites/test_suite_version.function | 2 +- tests/suites/test_suite_x509parse.function | 12 ++++++------ tests/suites/test_suite_x509write.function | 8 ++++---- tests/suites/test_suite_xtea.function | 2 +- 37 files changed, 69 insertions(+), 72 deletions(-) diff --git a/library/pem.c b/library/pem.c index c6d077c6..b5e8eeed 100644 --- a/library/pem.c +++ b/library/pem.c @@ -27,6 +27,7 @@ #endif #if defined(POLARSSL_PEM_PARSE_C) || defined(POLARSSL_PEM_WRITE_C) + #include "polarssl/pem.h" #include "polarssl/base64.h" #include "polarssl/des.h" diff --git a/tests/suites/test_suite_aes.function b/tests/suites/test_suite_aes.function index 3bd7d4a2..7027247a 100644 --- a/tests/suites/test_suite_aes.function +++ b/tests/suites/test_suite_aes.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/aes.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_arc4.function b/tests/suites/test_suite_arc4.function index b6d3d4ca..dc7b24b5 100644 --- a/tests/suites/test_suite_arc4.function +++ b/tests/suites/test_suite_arc4.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/arc4.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_asn1write.function b/tests/suites/test_suite_asn1write.function index 72e9b4bf..49b073aa 100644 --- a/tests/suites/test_suite_asn1write.function +++ b/tests/suites/test_suite_asn1write.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/asn1write.h" #define GUARD_LEN 4 #define GUARD_VAL 0x2a diff --git a/tests/suites/test_suite_base64.function b/tests/suites/test_suite_base64.function index 01d8aa6f..a8348d2e 100644 --- a/tests/suites/test_suite_base64.function +++ b/tests/suites/test_suite_base64.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/base64.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_camellia.function b/tests/suites/test_suite_camellia.function index 6d88f8cc..e73aa867 100644 --- a/tests/suites/test_suite_camellia.function +++ b/tests/suites/test_suite_camellia.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/camellia.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_ccm.function b/tests/suites/test_suite_ccm.function index d513a150..f597c691 100644 --- a/tests/suites/test_suite_ccm.function +++ b/tests/suites/test_suite_ccm.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/ccm.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function index 2bc1ef9d..448bfccc 100644 --- a/tests/suites/test_suite_cipher.function +++ b/tests/suites/test_suite_cipher.function @@ -1,8 +1,8 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/cipher.h" #if defined(POLARSSL_GCM_C) -#include +#include "polarssl/gcm.h" #endif /* END_HEADER */ diff --git a/tests/suites/test_suite_ctr_drbg.function b/tests/suites/test_suite_ctr_drbg.function index c9cb22ea..644eb467 100644 --- a/tests/suites/test_suite_ctr_drbg.function +++ b/tests/suites/test_suite_ctr_drbg.function @@ -1,7 +1,5 @@ /* BEGIN_HEADER */ -#include - -#include +#include "polarssl/ctr_drbg.h" int test_offset_idx; int entropy_func( void *data, unsigned char *buf, size_t len ) diff --git a/tests/suites/test_suite_debug.function b/tests/suites/test_suite_debug.function index b31b72a5..7db04e5d 100644 --- a/tests/suites/test_suite_debug.function +++ b/tests/suites/test_suite_debug.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/debug.h" struct buffer_data { diff --git a/tests/suites/test_suite_des.function b/tests/suites/test_suite_des.function index 4b5d53d0..dfa168f2 100644 --- a/tests/suites/test_suite_des.function +++ b/tests/suites/test_suite_des.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/des.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_dhm.function b/tests/suites/test_suite_dhm.function index ba9477f9..d7cabf46 100644 --- a/tests/suites/test_suite_dhm.function +++ b/tests/suites/test_suite_dhm.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/dhm.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_ecdh.function b/tests/suites/test_suite_ecdh.function index c84d2b1f..27be9691 100644 --- a/tests/suites/test_suite_ecdh.function +++ b/tests/suites/test_suite_ecdh.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/ecdh.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_ecdsa.function b/tests/suites/test_suite_ecdsa.function index 144326bc..ee379dcf 100644 --- a/tests/suites/test_suite_ecdsa.function +++ b/tests/suites/test_suite_ecdsa.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/ecdsa.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function index 1c22a846..696c5977 100644 --- a/tests/suites/test_suite_ecp.function +++ b/tests/suites/test_suite_ecp.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/ecp.h" #define POLARSSL_ECP_PF_UNKNOWN -1 /* END_HEADER */ diff --git a/tests/suites/test_suite_entropy.function b/tests/suites/test_suite_entropy.function index 6d137ad8..c46246c4 100644 --- a/tests/suites/test_suite_entropy.function +++ b/tests/suites/test_suite_entropy.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/entropy.h" /* * Number of calls made to entropy_dummy_source() diff --git a/tests/suites/test_suite_error.function b/tests/suites/test_suite_error.function index 4532530e..87287b7a 100644 --- a/tests/suites/test_suite_error.function +++ b/tests/suites/test_suite_error.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/error.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_gcm.function b/tests/suites/test_suite_gcm.function index c30b755b..2ac76280 100644 --- a/tests/suites/test_suite_gcm.function +++ b/tests/suites/test_suite_gcm.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/gcm.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_hmac_drbg.function b/tests/suites/test_suite_hmac_drbg.function index d58c426c..56267e07 100644 --- a/tests/suites/test_suite_hmac_drbg.function +++ b/tests/suites/test_suite_hmac_drbg.function @@ -1,7 +1,5 @@ /* BEGIN_HEADER */ -#include - -#include +#include "polarssl/hmac_drbg.h" typedef struct { diff --git a/tests/suites/test_suite_hmac_shax.function b/tests/suites/test_suite_hmac_shax.function index 54ad02f4..b31d7726 100644 --- a/tests/suites/test_suite_hmac_shax.function +++ b/tests/suites/test_suite_hmac_shax.function @@ -1,7 +1,7 @@ /* BEGIN_HEADER */ -#include -#include -#include +#include "polarssl/sha1.h" +#include "polarssl/sha256.h" +#include "polarssl/sha512.h" /* END_HEADER */ /* BEGIN_CASE depends_on:POLARSSL_SHA1_C */ diff --git a/tests/suites/test_suite_md.function b/tests/suites/test_suite_md.function index ea927260..40eb7177 100644 --- a/tests/suites/test_suite_md.function +++ b/tests/suites/test_suite_md.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/md.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_mdx.function b/tests/suites/test_suite_mdx.function index ecc1b921..6e4c6d83 100644 --- a/tests/suites/test_suite_mdx.function +++ b/tests/suites/test_suite_mdx.function @@ -1,8 +1,8 @@ /* BEGIN_HEADER */ -#include -#include -#include -#include +#include "polarssl/md2.h" +#include "polarssl/md4.h" +#include "polarssl/md5.h" +#include "polarssl/ripemd160.h" /* END_HEADER */ /* BEGIN_CASE depends_on:POLARSSL_MD2_C */ diff --git a/tests/suites/test_suite_memory_buffer_alloc.function b/tests/suites/test_suite_memory_buffer_alloc.function index 88c36abc..e9cd0217 100644 --- a/tests/suites/test_suite_memory_buffer_alloc.function +++ b/tests/suites/test_suite_memory_buffer_alloc.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/memory_buffer_alloc.h" #define TEST_SUITE_MEMORY_BUFFER_ALLOC /* END_HEADER */ diff --git a/tests/suites/test_suite_mpi.function b/tests/suites/test_suite_mpi.function index 2835acb1..795d2a02 100644 --- a/tests/suites/test_suite_mpi.function +++ b/tests/suites/test_suite_mpi.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/bignum.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pbkdf2.function b/tests/suites/test_suite_pbkdf2.function index cbac80ed..f99cb6d1 100644 --- a/tests/suites/test_suite_pbkdf2.function +++ b/tests/suites/test_suite_pbkdf2.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/pbkdf2.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pem.function b/tests/suites/test_suite_pem.function index e8b05eb3..f8aab47c 100644 --- a/tests/suites/test_suite_pem.function +++ b/tests/suites/test_suite_pem.function @@ -1,6 +1,6 @@ /* BEGIN_HEADER */ -#include -#include +#include "polarssl/base64.h" +#include "polarssl/pem.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function index fb86c99f..cc378c49 100644 --- a/tests/suites/test_suite_pk.function +++ b/tests/suites/test_suite_pk.function @@ -1,9 +1,9 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/pk.h" /* For error codes */ -#include -#include +#include "polarssl/ecp.h" +#include "polarssl/rsa.h" static int rnd_std_rand( void *rng_state, unsigned char *output, size_t len ); diff --git a/tests/suites/test_suite_pkcs1_v21.function b/tests/suites/test_suite_pkcs1_v21.function index 24b200e6..6fbe2e1d 100644 --- a/tests/suites/test_suite_pkcs1_v21.function +++ b/tests/suites/test_suite_pkcs1_v21.function @@ -1,6 +1,6 @@ /* BEGIN_HEADER */ -#include -#include +#include "polarssl/rsa.h" +#include "polarssl/md.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pkcs5.function b/tests/suites/test_suite_pkcs5.function index 1f61db68..f7165f6e 100644 --- a/tests/suites/test_suite_pkcs5.function +++ b/tests/suites/test_suite_pkcs5.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/pkcs5.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pkparse.function b/tests/suites/test_suite_pkparse.function index c0743268..9479cd99 100644 --- a/tests/suites/test_suite_pkparse.function +++ b/tests/suites/test_suite_pkparse.function @@ -1,7 +1,7 @@ /* BEGIN_HEADER */ -#include -#include -#include +#include "polarssl/pk.h" +#include "polarssl/pem.h" +#include "polarssl/oid.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pkwrite.function b/tests/suites/test_suite_pkwrite.function index b6cb943f..8b5fafbc 100644 --- a/tests/suites/test_suite_pkwrite.function +++ b/tests/suites/test_suite_pkwrite.function @@ -1,7 +1,7 @@ /* BEGIN_HEADER */ -#include -#include -#include +#include "polarssl/pk.h" +#include "polarssl/pem.h" +#include "polarssl/oid.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_rsa.function b/tests/suites/test_suite_rsa.function index bafacac9..45d57233 100644 --- a/tests/suites/test_suite_rsa.function +++ b/tests/suites/test_suite_rsa.function @@ -1,13 +1,13 @@ /* BEGIN_HEADER */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "polarssl/rsa.h" +#include "polarssl/md2.h" +#include "polarssl/md4.h" +#include "polarssl/md5.h" +#include "polarssl/sha1.h" +#include "polarssl/sha256.h" +#include "polarssl/sha512.h" +#include "polarssl/entropy.h" +#include "polarssl/ctr_drbg.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_shax.function b/tests/suites/test_suite_shax.function index 73190dcb..51c33011 100644 --- a/tests/suites/test_suite_shax.function +++ b/tests/suites/test_suite_shax.function @@ -1,7 +1,7 @@ /* BEGIN_HEADER */ -#include -#include -#include +#include "polarssl/sha1.h" +#include "polarssl/sha256.h" +#include "polarssl/sha512.h" /* END_HEADER */ /* BEGIN_CASE depends_on:POLARSSL_SHA1_C */ diff --git a/tests/suites/test_suite_version.function b/tests/suites/test_suite_version.function index 72c3ab1c..f50a6c29 100644 --- a/tests/suites/test_suite_version.function +++ b/tests/suites/test_suite_version.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/version.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function index 4329dccf..50de457b 100644 --- a/tests/suites/test_suite_x509parse.function +++ b/tests/suites/test_suite_x509parse.function @@ -1,10 +1,10 @@ /* BEGIN_HEADER */ -#include -#include -#include -#include -#include -#include +#include "polarssl/x509_crt.h" +#include "polarssl/x509_crl.h" +#include "polarssl/x509_csr.h" +#include "polarssl/pem.h" +#include "polarssl/oid.h" +#include "polarssl/base64.h" int verify_none( void *data, x509_crt *crt, int certificate_depth, int *flags ) { diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function index 701ed004..63f35a6d 100644 --- a/tests/suites/test_suite_x509write.function +++ b/tests/suites/test_suite_x509write.function @@ -1,8 +1,8 @@ /* BEGIN_HEADER */ -#include -#include -#include -#include +#include "polarssl/x509_crt.h" +#include "polarssl/x509_csr.h" +#include "polarssl/pem.h" +#include "polarssl/oid.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_xtea.function b/tests/suites/test_suite_xtea.function index 74ca6787..d22c7fdc 100644 --- a/tests/suites/test_suite_xtea.function +++ b/tests/suites/test_suite_xtea.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include "polarssl/xtea.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES