diff --git a/ctaocrypt/benchmark/benchmark.c b/ctaocrypt/benchmark/benchmark.c index 74da7b424..7fc34ab27 100644 --- a/ctaocrypt/benchmark/benchmark.c +++ b/ctaocrypt/benchmark/benchmark.c @@ -28,20 +28,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include +#include #ifdef _MSC_VER diff --git a/ctaocrypt/src/aes.c b/ctaocrypt/src/aes.c index b46e71bdf..2014e5b2d 100644 --- a/ctaocrypt/src/aes.c +++ b/ctaocrypt/src/aes.c @@ -25,13 +25,13 @@ #ifndef NO_AES -#include -#include -#include +#include +#include +#include #ifdef NO_INLINE - #include + #include #else - #include "ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/arc4.c b/ctaocrypt/src/arc4.c index 35122c4d1..4232da3ba 100644 --- a/ctaocrypt/src/arc4.c +++ b/ctaocrypt/src/arc4.c @@ -23,7 +23,7 @@ #include #endif -#include +#include void Arc4SetKey(Arc4* arc4, const byte* key, word32 length) diff --git a/ctaocrypt/src/ctc_asm.c b/ctaocrypt/src/asm.c similarity index 99% rename from ctaocrypt/src/ctc_asm.c rename to ctaocrypt/src/asm.c index d19fc87ea..406412005 100644 --- a/ctaocrypt/src/ctc_asm.c +++ b/ctaocrypt/src/asm.c @@ -1,4 +1,4 @@ -/* ctc_asm.c +/* asm.c * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * diff --git a/ctaocrypt/src/asn.c b/ctaocrypt/src/asn.c index 977c4a457..e9709d02d 100644 --- a/ctaocrypt/src/asn.c +++ b/ctaocrypt/src/asn.c @@ -28,22 +28,22 @@ #include "dc_rtc_api.h" /* to get current time */ #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_NTRU #include "crypto_ntru.h" #endif #ifdef HAVE_ECC - #include "ctc_ecc.h" + #include #endif diff --git a/ctaocrypt/src/coding.c b/ctaocrypt/src/coding.c index 4f55415c3..13209196a 100644 --- a/ctaocrypt/src/coding.c +++ b/ctaocrypt/src/coding.c @@ -23,9 +23,9 @@ #include #endif -#include -#include -#include +#include +#include +#include enum { diff --git a/ctaocrypt/src/cyassl_memory.c b/ctaocrypt/src/cyassl_memory.c index c9ec98361..184d0ba1c 100644 --- a/ctaocrypt/src/cyassl_memory.c +++ b/ctaocrypt/src/cyassl_memory.c @@ -26,12 +26,12 @@ /* submitted by eof */ -#include +#include #ifdef USE_CYASSL_MEMORY -#include -#include +#include +#include /* Set these to default values initially. */ diff --git a/ctaocrypt/src/des3.c b/ctaocrypt/src/des3.c index 075edd440..ff92e9aa1 100644 --- a/ctaocrypt/src/des3.c +++ b/ctaocrypt/src/des3.c @@ -25,12 +25,12 @@ #ifndef NO_DES3 -#include +#include #ifdef NO_INLINE - #include + #include #else - #include "ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/dh.c b/ctaocrypt/src/dh.c index 48892450a..882ee803d 100644 --- a/ctaocrypt/src/dh.c +++ b/ctaocrypt/src/dh.c @@ -25,8 +25,8 @@ #ifndef NO_DH -#include -#include +#include +#include #ifndef USER_MATH_LIB #include diff --git a/ctaocrypt/src/dsa.c b/ctaocrypt/src/dsa.c index a76e2789b..63ef20c2c 100644 --- a/ctaocrypt/src/dsa.c +++ b/ctaocrypt/src/dsa.c @@ -25,10 +25,10 @@ #ifndef NO_DSA -#include -#include -#include -#include +#include +#include +#include +#include enum { diff --git a/ctaocrypt/src/hc128.c b/ctaocrypt/src/hc128.c index c1f5be550..21990a249 100644 --- a/ctaocrypt/src/hc128.c +++ b/ctaocrypt/src/hc128.c @@ -25,11 +25,11 @@ #if HAVE_HC128 -#include +#include #ifdef NO_INLINE - #include + #include #else - #include "ctaocrypt/src/ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/hmac.c b/ctaocrypt/src/hmac.c index e22420bfd..5ff77155f 100644 --- a/ctaocrypt/src/hmac.c +++ b/ctaocrypt/src/hmac.c @@ -25,8 +25,8 @@ #ifndef NO_HMAC -#include -#include +#include +#include static int InitHmac(Hmac* hmac, int type) diff --git a/ctaocrypt/src/integer.c b/ctaocrypt/src/integer.c index 55a3f5c51..7ae49bfb2 100644 --- a/ctaocrypt/src/integer.c +++ b/ctaocrypt/src/integer.c @@ -31,11 +31,11 @@ #endif /* in case user set USE_FAST_MATH there */ -#include +#include #ifndef USE_FAST_MATH -#include +#include /* handle up to 6 inits */ diff --git a/ctaocrypt/src/logging.c b/ctaocrypt/src/logging.c index 28f869b54..e226a6858 100644 --- a/ctaocrypt/src/logging.c +++ b/ctaocrypt/src/logging.c @@ -25,9 +25,9 @@ /* submitted by eof */ -#include -#include -#include +#include +#include +#include CYASSL_API int CyaSSL_Debugging_ON(void); diff --git a/ctaocrypt/src/md4.c b/ctaocrypt/src/md4.c index 1f9672f20..c70e49199 100644 --- a/ctaocrypt/src/md4.c +++ b/ctaocrypt/src/md4.c @@ -26,11 +26,11 @@ #ifndef NO_MD4 -#include +#include #ifdef NO_INLINE - #include + #include #else - #include "ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/md5.c b/ctaocrypt/src/md5.c index 9ff0b445f..e20403c04 100644 --- a/ctaocrypt/src/md5.c +++ b/ctaocrypt/src/md5.c @@ -24,12 +24,12 @@ #include #endif -#include +#include #ifdef NO_INLINE - #include + #include #else - #include "ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/ctc_misc.c b/ctaocrypt/src/misc.c similarity index 98% rename from ctaocrypt/src/ctc_misc.c rename to ctaocrypt/src/misc.c index 26b44b6c3..984e508ad 100644 --- a/ctaocrypt/src/ctc_misc.c +++ b/ctaocrypt/src/misc.c @@ -1,4 +1,4 @@ -/* ctc_misc.c +/* misc.c * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -23,7 +23,7 @@ #include #endif -#include +#include /* inlining these functions is a huge speed increase and a small size decrease, because the functions are smaller than function call setup/cleanup, e.g., diff --git a/ctaocrypt/src/pwdbased.c b/ctaocrypt/src/pwdbased.c index e5c2b780c..6460814c4 100644 --- a/ctaocrypt/src/pwdbased.c +++ b/ctaocrypt/src/pwdbased.c @@ -25,17 +25,17 @@ #ifndef NO_PWDBASED -#include -#include -#include -#include +#include +#include +#include +#include #ifdef CYASSL_SHA512 - #include "ctc_sha512.h" + #include #endif #ifdef NO_INLINE - #include "ctc_misc.h" + #include #else - #include "ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/rabbit.c b/ctaocrypt/src/rabbit.c index 992780e4b..44b7255cf 100644 --- a/ctaocrypt/src/rabbit.c +++ b/ctaocrypt/src/rabbit.c @@ -25,11 +25,11 @@ #ifndef NO_RABBIT -#include +#include #ifdef NO_INLINE - #include + #include #else - #include "ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/random.c b/ctaocrypt/src/random.c index e4f50d5d4..b1ea1e70d 100644 --- a/ctaocrypt/src/random.c +++ b/ctaocrypt/src/random.c @@ -28,8 +28,8 @@ */ -#include -#include +#include +#include #if defined(USE_WINDOWS_API) diff --git a/ctaocrypt/src/ripemd.c b/ctaocrypt/src/ripemd.c index 565c8bd19..460fada90 100644 --- a/ctaocrypt/src/ripemd.c +++ b/ctaocrypt/src/ripemd.c @@ -26,11 +26,11 @@ #ifdef CYASSL_RIPEMD -#include "ctc_ripemd.h" +#include #ifdef NO_INLINE - #include + #include #else - #include "ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/rsa.c b/ctaocrypt/src/rsa.c index f4107e7f0..9fac30685 100644 --- a/ctaocrypt/src/rsa.c +++ b/ctaocrypt/src/rsa.c @@ -24,10 +24,10 @@ #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #ifdef SHOW_GEN #include diff --git a/ctaocrypt/src/sha.c b/ctaocrypt/src/sha.c index 6bdfe0e1e..6cde33397 100644 --- a/ctaocrypt/src/sha.c +++ b/ctaocrypt/src/sha.c @@ -23,11 +23,11 @@ #include #endif -#include +#include #ifdef NO_INLINE - #include + #include #else - #include "ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/sha256.c b/ctaocrypt/src/sha256.c index 7d3a5fce0..2dfeaf75a 100644 --- a/ctaocrypt/src/sha256.c +++ b/ctaocrypt/src/sha256.c @@ -28,11 +28,11 @@ #ifndef NO_SHA256 -#include +#include #ifdef NO_INLINE - #include + #include #else - #include "ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/sha512.c b/ctaocrypt/src/sha512.c index d5ebde2b2..d09c548b1 100644 --- a/ctaocrypt/src/sha512.c +++ b/ctaocrypt/src/sha512.c @@ -26,11 +26,11 @@ #ifdef CYASSL_SHA512 -#include "ctc_sha512.h" +#include #ifdef NO_INLINE - #include "ctc_misc.h" + #include #else - #include "ctc_misc.c" + #include #endif diff --git a/ctaocrypt/src/tfm.c b/ctaocrypt/src/tfm.c index fc5e0470f..409a5851a 100644 --- a/ctaocrypt/src/tfm.c +++ b/ctaocrypt/src/tfm.c @@ -35,12 +35,12 @@ #endif /* in case user set USE_FAST_MATH there */ -#include +#include #ifdef USE_FAST_MATH -#include -#include /* will define asm MACROS or C ones */ +#include +#include /* will define asm MACROS or C ones */ diff --git a/ctaocrypt/test/test.c b/ctaocrypt/test/test.c index 9150cf98e..fdddac91f 100644 --- a/ctaocrypt/test/test.c +++ b/ctaocrypt/test/test.c @@ -26,30 +26,30 @@ #include #ifdef CYASSL_TEST_CERT - #include + #include #else - #include + #include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_ECC - #include + #include #endif #ifdef _MSC_VER diff --git a/cyassl/ctaocrypt/ctc_aes.h b/cyassl/ctaocrypt/aes.h similarity index 97% rename from cyassl/ctaocrypt/ctc_aes.h rename to cyassl/ctaocrypt/aes.h index cc92c76ee..99f200fa9 100644 --- a/cyassl/ctaocrypt/ctc_aes.h +++ b/cyassl/ctaocrypt/aes.h @@ -1,4 +1,4 @@ -/* ctc_aes.h +/* aes.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -26,7 +26,7 @@ #define CTAO_CRYPT_AES_H -#include "ctc_types.h" +#include #ifdef CYASSL_AESNI diff --git a/cyassl/ctaocrypt/ctc_arc4.h b/cyassl/ctaocrypt/arc4.h similarity index 96% rename from cyassl/ctaocrypt/ctc_arc4.h rename to cyassl/ctaocrypt/arc4.h index ed33ad0b7..77d1e0dc0 100644 --- a/cyassl/ctaocrypt/ctc_arc4.h +++ b/cyassl/ctaocrypt/arc4.h @@ -1,4 +1,4 @@ -/* ctc_arc4.h +/* arc4.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -24,7 +24,7 @@ #define CTAO_CRYPT_ARC4_H -#include "ctc_types.h" +#include #ifdef __cplusplus diff --git a/cyassl/ctaocrypt/ctc_asn.h b/cyassl/ctaocrypt/asn.h similarity index 96% rename from cyassl/ctaocrypt/ctc_asn.h rename to cyassl/ctaocrypt/asn.h index ee759d808..e1eb92add 100644 --- a/cyassl/ctaocrypt/ctc_asn.h +++ b/cyassl/ctaocrypt/asn.h @@ -1,4 +1,4 @@ -/* ctc_asn.h +/* asn.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -23,14 +23,14 @@ #ifndef CTAO_CRYPT_ASN_H #define CTAO_CRYPT_ASN_H -#include "ctc_types.h" -#include "ctc_rsa.h" -#include "ctc_dh.h" -#include "ctc_dsa.h" -#include "ctc_sha.h" -#include "ctc_asn_public.h" /* public interface */ +#include +#include +#include +#include +#include +#include /* public interface */ #ifdef HAVE_ECC - #include "ctc_ecc.h" + #include #endif #ifdef __cplusplus diff --git a/cyassl/ctaocrypt/ctc_asn_public.h b/cyassl/ctaocrypt/asn_public.h similarity index 97% rename from cyassl/ctaocrypt/ctc_asn_public.h rename to cyassl/ctaocrypt/asn_public.h index f13c1e36c..d0ee9cf47 100644 --- a/cyassl/ctaocrypt/ctc_asn_public.h +++ b/cyassl/ctaocrypt/asn_public.h @@ -1,4 +1,4 @@ -/* ctc_asn_public.h +/* asn_public.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -23,9 +23,9 @@ #ifndef CTAO_CRYPT_ASN_PUBLIC_H #define CTAO_CRYPT_ASN_PUBLIC_H -#include "ctc_types.h" +#include #ifdef CYASSL_CERT_GEN - #include "ctc_rsa.h" + #include #endif diff --git a/cyassl/ctaocrypt/ctc_coding.h b/cyassl/ctaocrypt/coding.h similarity index 96% rename from cyassl/ctaocrypt/ctc_coding.h rename to cyassl/ctaocrypt/coding.h index bfe26ed2a..eb33e5adc 100644 --- a/cyassl/ctaocrypt/ctc_coding.h +++ b/cyassl/ctaocrypt/coding.h @@ -1,4 +1,4 @@ -/* ctc_coding.h +/* coding.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -23,7 +23,7 @@ #ifndef CTAO_CRYPT_CODING_H #define CTAO_CRYPT_CODING_H -#include "ctc_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_des3.h b/cyassl/ctaocrypt/des3.h similarity index 97% rename from cyassl/ctaocrypt/ctc_des3.h rename to cyassl/ctaocrypt/des3.h index 22159ba43..6b79dbc1e 100644 --- a/cyassl/ctaocrypt/ctc_des3.h +++ b/cyassl/ctaocrypt/des3.h @@ -1,4 +1,4 @@ -/* ctc_des3.h +/* des3.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -26,7 +26,7 @@ #define CTAO_CRYPT_DES3_H -#include "ctc_types.h" +#include #ifdef __cplusplus diff --git a/cyassl/ctaocrypt/ctc_dh.h b/cyassl/ctaocrypt/dh.h similarity index 93% rename from cyassl/ctaocrypt/ctc_dh.h rename to cyassl/ctaocrypt/dh.h index 1d08c37fc..9bd7c5c8a 100644 --- a/cyassl/ctaocrypt/ctc_dh.h +++ b/cyassl/ctaocrypt/dh.h @@ -1,4 +1,4 @@ -/* ctc_dh.h +/* dh.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -25,9 +25,9 @@ #ifndef CTAO_CRYPT_DH_H #define CTAO_CRYPT_DH_H -#include "ctc_types.h" -#include "ctc_integer.h" -#include "ctc_random.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_dsa.h b/cyassl/ctaocrypt/dsa.h similarity index 93% rename from cyassl/ctaocrypt/ctc_dsa.h rename to cyassl/ctaocrypt/dsa.h index e45a618b4..8b68b34cd 100644 --- a/cyassl/ctaocrypt/ctc_dsa.h +++ b/cyassl/ctaocrypt/dsa.h @@ -1,4 +1,4 @@ -/* ctc_dsa.h +/* dsa.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -25,9 +25,9 @@ #ifndef CTAO_CRYPT_DSA_H #define CTAO_CRYPT_DSA_H -#include "ctc_types.h" -#include "ctc_integer.h" -#include "ctc_random.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_ecc.h b/cyassl/ctaocrypt/ecc.h similarity index 96% rename from cyassl/ctaocrypt/ctc_ecc.h rename to cyassl/ctaocrypt/ecc.h index e57486fc3..9f2fe5264 100644 --- a/cyassl/ctaocrypt/ctc_ecc.h +++ b/cyassl/ctaocrypt/ecc.h @@ -1,4 +1,4 @@ -/* ctc_ecc.h +/* ecc.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -24,9 +24,9 @@ #ifndef CTAO_CRYPT_ECC_H #define CTAO_CRYPT_ECC_H -#include "ctc_types.h" -#include "ctc_integer.h" -#include "ctc_random.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_error.h b/cyassl/ctaocrypt/error.h similarity index 99% rename from cyassl/ctaocrypt/ctc_error.h rename to cyassl/ctaocrypt/error.h index 72d03d216..8915e6fa2 100644 --- a/cyassl/ctaocrypt/ctc_error.h +++ b/cyassl/ctaocrypt/error.h @@ -1,4 +1,4 @@ -/* ctc_error.h +/* error.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -23,7 +23,7 @@ #ifndef CTAO_CRYPT_ERROR_H #define CTAO_CRYPT_ERROR_H -#include "ctc_types.h" +#include #ifdef __cplusplus diff --git a/cyassl/ctaocrypt/ctc_hc128.h b/cyassl/ctaocrypt/hc128.h similarity index 96% rename from cyassl/ctaocrypt/ctc_hc128.h rename to cyassl/ctaocrypt/hc128.h index 578d192b7..a94360566 100644 --- a/cyassl/ctaocrypt/ctc_hc128.h +++ b/cyassl/ctaocrypt/hc128.h @@ -1,4 +1,4 @@ -/* ctc_hc128.h +/* hc128.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -25,7 +25,7 @@ #ifndef CTAO_CRYPT_HC128_H #define CTAO_CRYPT_HC128_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_hmac.h b/cyassl/ctaocrypt/hmac.h similarity index 94% rename from cyassl/ctaocrypt/ctc_hmac.h rename to cyassl/ctaocrypt/hmac.h index 97a3ff0ac..61a29c878 100644 --- a/cyassl/ctaocrypt/ctc_hmac.h +++ b/cyassl/ctaocrypt/hmac.h @@ -1,4 +1,4 @@ -/* ctc_hmac.h +/* hmac.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -25,11 +25,11 @@ #ifndef CTAO_CRYPT_HMAC_H #define CTAO_CRYPT_HMAC_H -#include "ctc_md5.h" -#include "ctc_sha.h" +#include +#include #ifndef NO_SHA256 - #include "ctc_sha256.h" + #include #endif #ifdef __cplusplus diff --git a/cyassl/ctaocrypt/include.am b/cyassl/ctaocrypt/include.am index c69faf463..a268bb95f 100644 --- a/cyassl/ctaocrypt/include.am +++ b/cyassl/ctaocrypt/include.am @@ -2,35 +2,35 @@ # All paths should be given relative to the root nobase_include_HEADERS+= \ - cyassl/ctaocrypt/ctc_aes.h \ - cyassl/ctaocrypt/ctc_arc4.h \ - cyassl/ctaocrypt/ctc_asn.h \ - cyassl/ctaocrypt/ctc_asn_public.h \ - cyassl/ctaocrypt/ctc_coding.h \ - cyassl/ctaocrypt/ctc_des3.h \ - cyassl/ctaocrypt/ctc_dh.h \ - cyassl/ctaocrypt/ctc_dsa.h \ - cyassl/ctaocrypt/ctc_ecc.h \ - cyassl/ctaocrypt/ctc_error.h \ - cyassl/ctaocrypt/ctc_hc128.h \ - cyassl/ctaocrypt/ctc_hmac.h \ - cyassl/ctaocrypt/ctc_integer.h \ - cyassl/ctaocrypt/ctc_md4.h \ - cyassl/ctaocrypt/ctc_md5.h \ - cyassl/ctaocrypt/ctc_misc.h \ - cyassl/ctaocrypt/ctc_pwdbased.h \ - cyassl/ctaocrypt/ctc_rabbit.h \ - cyassl/ctaocrypt/ctc_random.h \ - cyassl/ctaocrypt/ctc_ripemd.h \ - cyassl/ctaocrypt/ctc_rsa.h \ - cyassl/ctaocrypt/ctc_settings.h \ - cyassl/ctaocrypt/ctc_sha256.h \ - cyassl/ctaocrypt/ctc_sha512.h \ - cyassl/ctaocrypt/ctc_sha.h \ - cyassl/ctaocrypt/ctc_tfm.h \ - cyassl/ctaocrypt/ctc_types.h \ - cyassl/ctaocrypt/ctc_visibility.h \ - cyassl/ctaocrypt/cyassl_logging.h \ - cyassl/ctaocrypt/cyassl_memory.h \ + cyassl/ctaocrypt/aes.h \ + cyassl/ctaocrypt/arc4.h \ + cyassl/ctaocrypt/asn.h \ + cyassl/ctaocrypt/asn_public.h \ + cyassl/ctaocrypt/coding.h \ + cyassl/ctaocrypt/des3.h \ + cyassl/ctaocrypt/dh.h \ + cyassl/ctaocrypt/dsa.h \ + cyassl/ctaocrypt/ecc.h \ + cyassl/ctaocrypt/error.h \ + cyassl/ctaocrypt/hc128.h \ + cyassl/ctaocrypt/hmac.h \ + cyassl/ctaocrypt/integer.h \ + cyassl/ctaocrypt/md4.h \ + cyassl/ctaocrypt/md5.h \ + cyassl/ctaocrypt/misc.h \ + cyassl/ctaocrypt/pwdbased.h \ + cyassl/ctaocrypt/rabbit.h \ + cyassl/ctaocrypt/random.h \ + cyassl/ctaocrypt/ripemd.h \ + cyassl/ctaocrypt/rsa.h \ + cyassl/ctaocrypt/settings.h \ + cyassl/ctaocrypt/sha256.h \ + cyassl/ctaocrypt/sha512.h \ + cyassl/ctaocrypt/sha.h \ + cyassl/ctaocrypt/tfm.h \ + cyassl/ctaocrypt/types.h \ + cyassl/ctaocrypt/visibility.h \ + cyassl/ctaocrypt/logging.h \ + cyassl/ctaocrypt/memory.h \ cyassl/ctaocrypt/mpi_class.h \ cyassl/ctaocrypt/mpi_superclass.h diff --git a/cyassl/ctaocrypt/ctc_integer.h b/cyassl/ctaocrypt/integer.h similarity index 98% rename from cyassl/ctaocrypt/ctc_integer.h rename to cyassl/ctaocrypt/integer.h index 4bfbe3067..74d97fd0d 100644 --- a/cyassl/ctaocrypt/ctc_integer.h +++ b/cyassl/ctaocrypt/integer.h @@ -1,4 +1,4 @@ -/* ctc_integer.h +/* integer.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -31,16 +31,16 @@ /* may optionally use fast math instead, not yet supported on all platforms and may not be faster on all */ -#include "ctc_types.h" /* will set MP_xxBIT if not default */ +#include /* will set MP_xxBIT if not default */ #ifdef USE_FAST_MATH - #include "ctc_tfm.h" + #include #else #ifndef CHAR_BIT #include #endif -#include "mpi_class.h" +#include #ifndef MIN #define MIN(x,y) ((x)<(y)?(x):(y)) diff --git a/cyassl/ctaocrypt/cyassl_logging.h b/cyassl/ctaocrypt/logging.h similarity index 98% rename from cyassl/ctaocrypt/cyassl_logging.h rename to cyassl/ctaocrypt/logging.h index aba438799..1c48f17a5 100644 --- a/cyassl/ctaocrypt/cyassl_logging.h +++ b/cyassl/ctaocrypt/logging.h @@ -1,4 +1,4 @@ -/* cyassl_logging.h +/* logging.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * diff --git a/cyassl/ctaocrypt/ctc_md4.h b/cyassl/ctaocrypt/md4.h similarity index 97% rename from cyassl/ctaocrypt/ctc_md4.h rename to cyassl/ctaocrypt/md4.h index 5eb6e1fe6..15a07c7fe 100644 --- a/cyassl/ctaocrypt/ctc_md4.h +++ b/cyassl/ctaocrypt/md4.h @@ -1,4 +1,4 @@ -/* ctc_md4.h +/* md4.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -25,7 +25,7 @@ #ifndef CTAO_CRYPT_MD4_H #define CTAO_CRYPT_MD4_H -#include "ctc_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_md5.h b/cyassl/ctaocrypt/md5.h similarity index 97% rename from cyassl/ctaocrypt/ctc_md5.h rename to cyassl/ctaocrypt/md5.h index 9e1d20276..6bd0635b2 100644 --- a/cyassl/ctaocrypt/ctc_md5.h +++ b/cyassl/ctaocrypt/md5.h @@ -1,4 +1,4 @@ -/* ctc_md5.h +/* md5.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -23,7 +23,7 @@ #ifndef CTAO_CRYPT_MD5_H #define CTAO_CRYPT_MD5_H -#include "ctc_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/cyassl_memory.h b/cyassl/ctaocrypt/memory.h similarity index 98% rename from cyassl/ctaocrypt/cyassl_memory.h rename to cyassl/ctaocrypt/memory.h index 6a1760068..f4787fc80 100644 --- a/cyassl/ctaocrypt/cyassl_memory.h +++ b/cyassl/ctaocrypt/memory.h @@ -1,4 +1,4 @@ -/* cyassl_memory.h +/* memory.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * diff --git a/cyassl/ctaocrypt/ctc_misc.h b/cyassl/ctaocrypt/misc.h similarity index 96% rename from cyassl/ctaocrypt/ctc_misc.h rename to cyassl/ctaocrypt/misc.h index 196dadf85..dc02842fa 100644 --- a/cyassl/ctaocrypt/ctc_misc.h +++ b/cyassl/ctaocrypt/misc.h @@ -1,4 +1,4 @@ -/* ctc_misc.h +/* misc.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -24,7 +24,7 @@ #define CTAO_CRYPT_MISC_H -#include "ctc_types.h" +#include #ifdef __cplusplus diff --git a/cyassl/ctaocrypt/ctc_pwdbased.h b/cyassl/ctaocrypt/pwdbased.h similarity index 91% rename from cyassl/ctaocrypt/ctc_pwdbased.h rename to cyassl/ctaocrypt/pwdbased.h index 35a39961a..41bcac20e 100644 --- a/cyassl/ctaocrypt/ctc_pwdbased.h +++ b/cyassl/ctaocrypt/pwdbased.h @@ -1,4 +1,4 @@ -/* ctc_pwdbased.h +/* pwdbased.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -25,9 +25,9 @@ #ifndef CTAO_CRYPT_PWDBASED_H #define CTAO_CRYPT_PWDBASED_H -#include "ctc_types.h" -#include "ctc_md5.h" /* for hash type */ -#include "ctc_sha.h" +#include +#include /* for hash type */ +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_rabbit.h b/cyassl/ctaocrypt/rabbit.h similarity index 96% rename from cyassl/ctaocrypt/ctc_rabbit.h rename to cyassl/ctaocrypt/rabbit.h index a4a04acb5..f5b9557cd 100644 --- a/cyassl/ctaocrypt/ctc_rabbit.h +++ b/cyassl/ctaocrypt/rabbit.h @@ -1,4 +1,4 @@ -/* ctc_rabbit.h +/* rabbit.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -25,7 +25,7 @@ #ifndef CTAO_CRYPT_RABBIT_H #define CTAO_CRYPT_RABBIT_H -#include "ctc_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_random.h b/cyassl/ctaocrypt/random.h similarity index 97% rename from cyassl/ctaocrypt/ctc_random.h rename to cyassl/ctaocrypt/random.h index 121fd24ce..2dd1dc33f 100644 --- a/cyassl/ctaocrypt/ctc_random.h +++ b/cyassl/ctaocrypt/random.h @@ -1,4 +1,4 @@ -/* ctc_random.h +/* random.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -23,7 +23,7 @@ #ifndef CTAO_CRYPT_RANDOM_H #define CTAO_CRYPT_RANDOM_H -#include "ctc_arc4.h" +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_ripemd.h b/cyassl/ctaocrypt/ripemd.h similarity index 97% rename from cyassl/ctaocrypt/ctc_ripemd.h rename to cyassl/ctaocrypt/ripemd.h index 313a8af34..6c43d21c7 100644 --- a/cyassl/ctaocrypt/ctc_ripemd.h +++ b/cyassl/ctaocrypt/ripemd.h @@ -1,4 +1,4 @@ -/* ctc_ripemd.h +/* ripemd.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -25,7 +25,7 @@ #ifndef CTAO_CRYPT_RIPEMD_H #define CTAO_CRYPT_RIPEME_H -#include "ctc_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_rsa.h b/cyassl/ctaocrypt/rsa.h similarity index 95% rename from cyassl/ctaocrypt/ctc_rsa.h rename to cyassl/ctaocrypt/rsa.h index 138346ad9..8b34a351d 100644 --- a/cyassl/ctaocrypt/ctc_rsa.h +++ b/cyassl/ctaocrypt/rsa.h @@ -1,4 +1,4 @@ -/* ctc_rsa.h +/* rsa.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -23,9 +23,9 @@ #ifndef CTAO_CRYPT_RSA_H #define CTAO_CRYPT_RSA_H -#include "ctc_types.h" -#include "ctc_integer.h" -#include "ctc_random.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_settings.h b/cyassl/ctaocrypt/settings.h similarity index 98% rename from cyassl/ctaocrypt/ctc_settings.h rename to cyassl/ctaocrypt/settings.h index c73f264ef..28cb60f0d 100644 --- a/cyassl/ctaocrypt/ctc_settings.h +++ b/cyassl/ctaocrypt/settings.h @@ -1,4 +1,4 @@ -/* ctc_settings.h +/* settings.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -20,7 +20,7 @@ */ /* Place OS specific preprocessor flags, defines, includes here, will be - included into every file because ctc_types.h includes it */ + included into every file because types.h includes it */ #ifndef CTAO_CRYPT_SETTINGS_H @@ -54,7 +54,7 @@ /* Uncomment next line if builing yaSSL with autoconf and want version string */ /* #define USE_CYASSL_VERSION */ -#include +#include #ifdef IPHONE #define SIZEOF_LONG_LONG 8 diff --git a/cyassl/ctaocrypt/ctc_sha.h b/cyassl/ctaocrypt/sha.h similarity index 95% rename from cyassl/ctaocrypt/ctc_sha.h rename to cyassl/ctaocrypt/sha.h index acb01c7ab..9fa1def56 100644 --- a/cyassl/ctaocrypt/ctc_sha.h +++ b/cyassl/ctaocrypt/sha.h @@ -1,4 +1,4 @@ -/* ctc_sha.h +/* sha.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -20,11 +20,10 @@ */ -#pragma once #ifndef CTAO_CRYPT_SHA_H #define CTAO_CRYPT_SHA_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_sha256.h b/cyassl/ctaocrypt/sha256.h similarity index 97% rename from cyassl/ctaocrypt/ctc_sha256.h rename to cyassl/ctaocrypt/sha256.h index 38fa059c7..3de45379a 100644 --- a/cyassl/ctaocrypt/ctc_sha256.h +++ b/cyassl/ctaocrypt/sha256.h @@ -1,4 +1,4 @@ -/* ctc_sha256.h +/* sha256.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -28,7 +28,7 @@ #ifndef CTAO_CRYPT_SHA256_H #define CTAO_CRYPT_SHA256_H -#include "ctc_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_sha512.h b/cyassl/ctaocrypt/sha512.h similarity index 97% rename from cyassl/ctaocrypt/ctc_sha512.h rename to cyassl/ctaocrypt/sha512.h index f20899d67..0ce02f65d 100644 --- a/cyassl/ctaocrypt/ctc_sha512.h +++ b/cyassl/ctaocrypt/sha512.h @@ -1,4 +1,4 @@ -/* ctc_sha512.h +/* sha512.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -25,7 +25,7 @@ #ifndef CTAO_CRYPT_SHA512_H #define CTAO_CRYPT_SHA512_H -#include "ctc_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/ctc_tfm.h b/cyassl/ctaocrypt/tfm.h similarity index 99% rename from cyassl/ctaocrypt/ctc_tfm.h rename to cyassl/ctaocrypt/tfm.h index ab16f1a21..9322d3145 100644 --- a/cyassl/ctaocrypt/ctc_tfm.h +++ b/cyassl/ctaocrypt/tfm.h @@ -1,4 +1,4 @@ -/* ctc_tfm.h +/* tfm.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -35,7 +35,7 @@ #ifndef CTAO_CRYPT_TFM_H #define CTAO_CRYPT_TFM_H -#include "ctc_types.h" +#include #ifndef CHAR_BIT #include #endif diff --git a/cyassl/ctaocrypt/ctc_types.h b/cyassl/ctaocrypt/types.h similarity index 98% rename from cyassl/ctaocrypt/ctc_types.h rename to cyassl/ctaocrypt/types.h index 592c6cebe..0de50e797 100644 --- a/cyassl/ctaocrypt/ctc_types.h +++ b/cyassl/ctaocrypt/types.h @@ -1,4 +1,4 @@ -/* ctc_types.h +/* types.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -23,7 +23,7 @@ #ifndef CTAO_CRYPT_TYPES_H #define CTAO_CRYPT_TYPES_H -#include +#include #ifdef __cplusplus extern "C" { @@ -131,7 +131,7 @@ enum { extern void XFREE(void *p, void* heap, int type); #elif !defined(MICRIUM_MALLOC) /* default C runtime, can install different routines at runtime */ - #include "cyassl_memory.h" + #include #define XMALLOC(s, h, t) CyaSSL_Malloc((s)) #define XFREE(p, h, t) {void* xp = (p); if((xp)) CyaSSL_Free((xp));} #define XREALLOC(p, n, h, t) CyaSSL_Realloc((p), (n)) diff --git a/cyassl/ctaocrypt/ctc_visibility.h b/cyassl/ctaocrypt/visibility.h similarity index 99% rename from cyassl/ctaocrypt/ctc_visibility.h rename to cyassl/ctaocrypt/visibility.h index 86f402493..bfcb01a2b 100644 --- a/cyassl/ctaocrypt/ctc_visibility.h +++ b/cyassl/ctaocrypt/visibility.h @@ -1,4 +1,4 @@ -/* ctc_visibility.h +/* visibility.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * diff --git a/cyassl/cyassl_error.h b/cyassl/error.h similarity index 98% rename from cyassl/cyassl_error.h rename to cyassl/error.h index 652959bca..ee79ae4da 100644 --- a/cyassl/cyassl_error.h +++ b/cyassl/error.h @@ -1,4 +1,4 @@ -/* cyassl_error.h +/* error.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -23,7 +23,7 @@ #ifndef CYASSL_ERROR_H #define CYASSL_ERROR_H -#include /* CTaoCrypt errors */ +#include /* pull in CTaoCrypt errors */ #ifdef __cplusplus extern "C" { diff --git a/cyassl/include.am b/cyassl/include.am index 89163d8b0..95b146c04 100644 --- a/cyassl/include.am +++ b/cyassl/include.am @@ -8,8 +8,8 @@ include cyassl/openssl/include.am EXTRA_DIST+= cyassl/sniffer_error.rc nobase_include_HEADERS+= \ - cyassl/cyassl_error.h \ - cyassl/cyassl_int.h \ + cyassl/error.h \ + cyassl/internal.h \ cyassl/sniffer_error.h \ cyassl/sniffer.h \ cyassl/version.h diff --git a/cyassl/cyassl_int.h b/cyassl/internal.h similarity index 98% rename from cyassl/cyassl_int.h rename to cyassl/internal.h index c5959a801..978d789a9 100644 --- a/cyassl/cyassl_int.h +++ b/cyassl/internal.h @@ -1,4 +1,4 @@ -/* cyassl_int.h +/* internal.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -24,24 +24,24 @@ #define CYASSL_INT_H -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_ECC - #include + #include #endif #ifndef NO_SHA256 - #include + #include #endif #ifdef CYASSL_CALLBACKS - #include "cyassl_callbacks.h" + #include #include #endif diff --git a/cyassl/openssl/cyassl_test.h b/cyassl/openssl/cyassl_test.h index e0820b506..eefb1b041 100644 --- a/cyassl/openssl/cyassl_test.h +++ b/cyassl/openssl/cyassl_test.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #ifdef USE_WINDOWS_API #include diff --git a/cyassl/openssl/ssl.h b/cyassl/openssl/ssl.h index cd9610a9b..105c9e445 100644 --- a/cyassl/openssl/ssl.h +++ b/cyassl/openssl/ssl.h @@ -29,7 +29,7 @@ #define CYASSL_OPENSSL_H_ /* for users not using preprocessor flags */ -#include +#include #ifdef USE_CYASSL_VERSION #include diff --git a/cyassl/sniffer.h b/cyassl/sniffer.h index 270bf9d41..e3943cc16 100644 --- a/cyassl/sniffer.h +++ b/cyassl/sniffer.h @@ -23,7 +23,7 @@ #ifndef CYASSL_SNIFFER_H #define CYASSL_SNIFFER_H -#include +#include #ifdef _WIN32 #ifdef SSL_SNIFFER_EXPORTS diff --git a/src/include.am b/src/include.am index c4adc8154..7c9c9702c 100644 --- a/src/include.am +++ b/src/include.am @@ -4,8 +4,8 @@ lib_LTLIBRARIES+= src/libcyassl.la src_libcyassl_la_SOURCES = \ - src/cyassl_int.c \ - src/cyassl_io.c \ + src/internal.c \ + src/io.c \ src/keys.c \ src/ssl.c \ src/tls.c \ @@ -53,7 +53,7 @@ src_libcyassl_la_SOURCES += ctaocrypt/src/hc128.c endif if BUILD_NOINLINE -src_libcyassl_la_SOURCES += ctaocrypt/src/ctc_misc.c +src_libcyassl_la_SOURCES += ctaocrypt/src/misc.c endif if BUILD_FASTMATH diff --git a/src/cyassl_int.c b/src/internal.c similarity index 99% rename from src/cyassl_int.c rename to src/internal.c index 7d01448e1..5d8cdeba2 100644 --- a/src/cyassl_int.c +++ b/src/internal.c @@ -1,4 +1,4 @@ -/* cyassl_int.c +/* internal.c * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -24,9 +24,9 @@ #include #endif -#include -#include -#include +#include +#include +#include #ifdef HAVE_LIBZ #include "zlib.h" diff --git a/src/cyassl_io.c b/src/io.c similarity index 99% rename from src/cyassl_io.c rename to src/io.c index 2cfc4a8b1..fc9ce3286 100644 --- a/src/cyassl_io.c +++ b/src/io.c @@ -1,4 +1,4 @@ -/* cyassl_io.c +/* io.c * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * @@ -28,7 +28,7 @@ #include #endif -#include +#include /* if user writes own I/O callbacks they can define CYASSL_USER_IO to remove automatic setting of default I/O functions EmbedSend() and EmbedReceive() diff --git a/src/keys.c b/src/keys.c index 2e9ba3d4c..6baadb00f 100644 --- a/src/keys.c +++ b/src/keys.c @@ -24,8 +24,8 @@ #include #endif -#include -#include +#include +#include #ifdef SHOW_SECRETS #include #endif diff --git a/src/ssl.c b/src/ssl.c index 20727ee68..8ff928049 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -31,9 +31,9 @@ #define FALSE 0 #include -#include -#include -#include +#include +#include +#include #if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) #include @@ -45,10 +45,10 @@ #include #include /* openssl headers end, cyassl internal headers next */ - #include - #include - #include - #include + #include + #include + #include + #include #endif diff --git a/src/tls.c b/src/tls.c index fbc09999c..ca8ee692d 100644 --- a/src/tls.c +++ b/src/tls.c @@ -24,9 +24,9 @@ #endif #include -#include -#include -#include +#include +#include +#include diff --git a/swig/cyassl_adds.c b/swig/cyassl_adds.c index 18d8085e4..49a9303f1 100644 --- a/swig/cyassl_adds.c +++ b/swig/cyassl_adds.c @@ -28,8 +28,8 @@ #endif #include -#include -#include +#include +#include #include #include diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c index 2d39edafd..83e2dde33 100644 --- a/testsuite/testsuite.c +++ b/testsuite/testsuite.c @@ -25,7 +25,7 @@ #include #include -#include +#include #ifdef SINGLE_THREADED #error testsuite needs threads to run, please run ctaocrypt/test, \