remove ctc_ prefix and cyassl_ prefix since all includes now specify dir

ctaocrypt/benchmark/benchmark.c

@@ -28,20 +28,20 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <cyassl/ctaocrypt/ctc_des3.h>
-#include <cyassl/ctaocrypt/ctc_arc4.h>
-#include <cyassl/ctaocrypt/ctc_hc128.h>
-#include <cyassl/ctaocrypt/ctc_rabbit.h>
-#include <cyassl/ctaocrypt/ctc_aes.h>
-#include <cyassl/ctaocrypt/ctc_md5.h>
-#include <cyassl/ctaocrypt/ctc_sha.h>
-#include <cyassl/ctaocrypt/ctc_sha256.h>
-#include <cyassl/ctaocrypt/ctc_sha512.h>
-#include <cyassl/ctaocrypt/ctc_rsa.h>
-#include <cyassl/ctaocrypt/ctc_asn.h>
-#include <cyassl/ctaocrypt/ctc_ripemd.h>
+#include <cyassl/ctaocrypt/des3.h>
+#include <cyassl/ctaocrypt/arc4.h>
+#include <cyassl/ctaocrypt/hc128.h>
+#include <cyassl/ctaocrypt/rabbit.h>
+#include <cyassl/ctaocrypt/aes.h>
+#include <cyassl/ctaocrypt/md5.h>
+#include <cyassl/ctaocrypt/sha.h>
+#include <cyassl/ctaocrypt/sha256.h>
+#include <cyassl/ctaocrypt/sha512.h>
+#include <cyassl/ctaocrypt/rsa.h>
+#include <cyassl/ctaocrypt/asn.h>
+#include <cyassl/ctaocrypt/ripemd.h>
 
-#include <cyassl/ctaocrypt/ctc_dh.h>
+#include <cyassl/ctaocrypt/dh.h>
 
 
 #ifdef _MSC_VER

ctaocrypt/src/aes.c

@@ -25,13 +25,13 @@
 
 #ifndef NO_AES
 
-#include <cyassl/ctaocrypt/ctc_aes.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
-#include <cyassl/ctaocrypt/cyassl_logging.h>
+#include <cyassl/ctaocrypt/aes.h>
+#include <cyassl/ctaocrypt/error.h>
+#include <cyassl/ctaocrypt/logging.h>
 #ifdef NO_INLINE
-    #include <cyassl/ctaocrypt/ctc_misc.h>
+    #include <cyassl/ctaocrypt/misc.h>
 #else
-    #include "ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

ctaocrypt/src/arc4.c

@@ -23,7 +23,7 @@
     #include <config.h>
 #endif
 
-#include <cyassl/ctaocrypt/ctc_arc4.h>
+#include <cyassl/ctaocrypt/arc4.h>
 
 
 void Arc4SetKey(Arc4* arc4, const byte* key, word32 length)

ctaocrypt/src/asm.c

@@ -1,4 +1,4 @@
-/* ctc_asm.c
+/* asm.c
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *

ctaocrypt/src/asn.c

@@ -28,22 +28,22 @@
     #include "dc_rtc_api.h"   /* to get current time */
 #endif
 
-#include <cyassl/ctaocrypt/ctc_asn.h>
-#include <cyassl/ctaocrypt/ctc_coding.h>
-#include <cyassl/ctaocrypt/ctc_sha.h>
-#include <cyassl/ctaocrypt/ctc_md5.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
-#include <cyassl/ctaocrypt/ctc_pwdbased.h>
-#include <cyassl/ctaocrypt/ctc_des3.h>
-#include <cyassl/ctaocrypt/ctc_sha256.h>
-#include <cyassl/ctaocrypt/cyassl_logging.h>
+#include <cyassl/ctaocrypt/asn.h>
+#include <cyassl/ctaocrypt/coding.h>
+#include <cyassl/ctaocrypt/sha.h>
+#include <cyassl/ctaocrypt/md5.h>
+#include <cyassl/ctaocrypt/error.h>
+#include <cyassl/ctaocrypt/pwdbased.h>
+#include <cyassl/ctaocrypt/des3.h>
+#include <cyassl/ctaocrypt/sha256.h>
+#include <cyassl/ctaocrypt/logging.h>
 
 #ifdef HAVE_NTRU
     #include "crypto_ntru.h"
 #endif
 
 #ifdef HAVE_ECC
-    #include "ctc_ecc.h"
+    #include <cyassl/ctaocrypt/ecc.h>
 #endif
 
 

ctaocrypt/src/coding.c

@@ -23,9 +23,9 @@
     #include <config.h>
 #endif
 
-#include <cyassl/ctaocrypt/ctc_coding.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
-#include <cyassl/ctaocrypt/cyassl_logging.h>
+#include <cyassl/ctaocrypt/coding.h>
+#include <cyassl/ctaocrypt/error.h>
+#include <cyassl/ctaocrypt/logging.h>
 
 
 enum {

ctaocrypt/src/cyassl_memory.c

@@ -26,12 +26,12 @@
 /* submitted by eof */
 
 
-#include <cyassl/ctaocrypt/ctc_settings.h>
+#include <cyassl/ctaocrypt/settings.h>
 
 #ifdef USE_CYASSL_MEMORY
 
-#include <cyassl/ctaocrypt/cyassl_memory.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
+#include <cyassl/ctaocrypt/memory.h>
+#include <cyassl/ctaocrypt/error.h>
 
 
 /* Set these to default values initially. */

ctaocrypt/src/des3.c

@@ -25,12 +25,12 @@
 
 #ifndef NO_DES3
 
-#include <cyassl/ctaocrypt/ctc_des3.h>
+#include <cyassl/ctaocrypt/des3.h>
 
 #ifdef NO_INLINE
-    #include <cyassl/ctaocrypt/ctc_misc.h>
+    #include <cyassl/ctaocrypt/misc.h>
 #else
-    #include "ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

ctaocrypt/src/dh.c

@@ -25,8 +25,8 @@
 
 #ifndef NO_DH
 
-#include <cyassl/ctaocrypt/ctc_dh.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
+#include <cyassl/ctaocrypt/dh.h>
+#include <cyassl/ctaocrypt/error.h>
 
 #ifndef USER_MATH_LIB
     #include <math.h>

ctaocrypt/src/dsa.c

@@ -25,10 +25,10 @@
 
 #ifndef NO_DSA
 
-#include <cyassl/ctaocrypt/ctc_dsa.h>
-#include <cyassl/ctaocrypt/ctc_sha.h>
-#include <cyassl/ctaocrypt/ctc_random.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
+#include <cyassl/ctaocrypt/dsa.h>
+#include <cyassl/ctaocrypt/sha.h>
+#include <cyassl/ctaocrypt/random.h>
+#include <cyassl/ctaocrypt/error.h>
 
 
 enum {

ctaocrypt/src/hc128.c

@@ -25,11 +25,11 @@
 
 #if HAVE_HC128
 
-#include <cyassl/ctaocrypt/ctc_hc128.h>
+#include <cyassl/ctaocrypt/hc128.h>
 #ifdef NO_INLINE
-    #include <cyassl/ctaocrypt/ctc_hc128.h>
+    #include <cyassl/ctaocrypt/hc128.h>
 #else
-    #include "ctaocrypt/src/ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

ctaocrypt/src/hmac.c

@@ -25,8 +25,8 @@
 
 #ifndef NO_HMAC
 
-#include <cyassl/ctaocrypt/ctc_hmac.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
+#include <cyassl/ctaocrypt/hmac.h>
+#include <cyassl/ctaocrypt/error.h>
 
 
 static int InitHmac(Hmac* hmac, int type)

ctaocrypt/src/integer.c

@@ -31,11 +31,11 @@
 #endif
 
 /* in case user set USE_FAST_MATH there */
-#include <cyassl/ctaocrypt/ctc_settings.h>
+#include <cyassl/ctaocrypt/settings.h>
 
 #ifndef USE_FAST_MATH
 
-#include <cyassl/ctaocrypt/ctc_integer.h>
+#include <cyassl/ctaocrypt/integer.h>
 
 
 /* handle up to 6 inits */

ctaocrypt/src/logging.c

@@ -25,9 +25,9 @@
 
 /* submitted by eof */
 
-#include <cyassl/ctaocrypt/ctc_settings.h>
-#include <cyassl/ctaocrypt/cyassl_logging.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
+#include <cyassl/ctaocrypt/settings.h>
+#include <cyassl/ctaocrypt/logging.h>
+#include <cyassl/ctaocrypt/error.h>
 
 
 CYASSL_API int  CyaSSL_Debugging_ON(void);

ctaocrypt/src/md4.c

@@ -26,11 +26,11 @@
 
 #ifndef NO_MD4
 
-#include <cyassl/ctaocrypt/ctc_md4.h>
+#include <cyassl/ctaocrypt/md4.h>
 #ifdef NO_INLINE
-    #include <cyassl/ctaocrypt/ctc_misc.h>
+    #include <cyassl/ctaocrypt/misc.h>
 #else
-    #include "ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

ctaocrypt/src/md5.c

@@ -24,12 +24,12 @@
     #include <config.h>
 #endif
 
-#include <cyassl/ctaocrypt/ctc_md5.h>
+#include <cyassl/ctaocrypt/md5.h>
 
 #ifdef NO_INLINE
-    #include <cyassl/ctaocrypt/ctc_misc.h>
+    #include <cyassl/ctaocrypt/misc.h>
 #else
-    #include "ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

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 <config.h>
 #endif
 
-#include <cyassl/ctaocrypt/ctc_misc.h>
+#include <cyassl/ctaocrypt/misc.h>
 
 /* 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.,

ctaocrypt/src/pwdbased.c

@@ -25,17 +25,17 @@
 
 #ifndef NO_PWDBASED
 
-#include <cyassl/ctaocrypt/ctc_pwdbased.h>
-#include <cyassl/ctaocrypt/ctc_hmac.h>
-#include <cyassl/ctaocrypt/ctc_integer.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
+#include <cyassl/ctaocrypt/pwdbased.h>
+#include <cyassl/ctaocrypt/hmac.h>
+#include <cyassl/ctaocrypt/integer.h>
+#include <cyassl/ctaocrypt/error.h>
 #ifdef CYASSL_SHA512
-    #include "ctc_sha512.h"
+    #include <cyassl/ctaocrypt/sha512.h>
 #endif
 #ifdef NO_INLINE
-    #include "ctc_misc.h"
+    #include <cyassl/ctaocrypt/misc.h>
 #else
-    #include "ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

ctaocrypt/src/rabbit.c

@@ -25,11 +25,11 @@
 
 #ifndef NO_RABBIT
 
-#include <cyassl/ctaocrypt/ctc_rabbit.h>
+#include <cyassl/ctaocrypt/rabbit.h>
 #ifdef NO_INLINE
-    #include <cyassl/ctaocrypt/ctc_misc.h>
+    #include <cyassl/ctaocrypt/misc.h>
 #else
-    #include "ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

ctaocrypt/src/random.c

@@ -28,8 +28,8 @@
 
 */
 
-#include <cyassl/ctaocrypt/ctc_random.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
+#include <cyassl/ctaocrypt/random.h>
+#include <cyassl/ctaocrypt/error.h>
 
 
 #if defined(USE_WINDOWS_API)

ctaocrypt/src/ripemd.c

@@ -26,11 +26,11 @@
 
 #ifdef CYASSL_RIPEMD
 
-#include "ctc_ripemd.h"
+#include <cyassl/ctaocrypt/ripemd.h>
 #ifdef NO_INLINE
-    #include <cyassl/ctaocrypt/ctc_misc.h>
+    #include <cyassl/ctaocrypt/misc.h>
 #else
-    #include "ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

ctaocrypt/src/rsa.c

@@ -24,10 +24,10 @@
     #include <config.h>
 #endif
 
-#include <cyassl/ctaocrypt/ctc_rsa.h>
-#include <cyassl/ctaocrypt/ctc_random.h>
-#include <cyassl/ctaocrypt/ctc_error.h>
-#include <cyassl/ctaocrypt/cyassl_logging.h>
+#include <cyassl/ctaocrypt/rsa.h>
+#include <cyassl/ctaocrypt/random.h>
+#include <cyassl/ctaocrypt/error.h>
+#include <cyassl/ctaocrypt/logging.h>
 
 #ifdef SHOW_GEN
     #include <stdio.h>

ctaocrypt/src/sha.c

@@ -23,11 +23,11 @@
     #include <config.h>
 #endif
 
-#include <cyassl/ctaocrypt/ctc_sha.h>
+#include <cyassl/ctaocrypt/sha.h>
 #ifdef NO_INLINE
-    #include <cyassl/ctaocrypt/ctc_misc.h>
+    #include <cyassl/ctaocrypt/misc.h>
 #else
-    #include "ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

ctaocrypt/src/sha256.c

@@ -28,11 +28,11 @@
 
 #ifndef NO_SHA256
 
-#include <cyassl/ctaocrypt/ctc_sha256.h>
+#include <cyassl/ctaocrypt/sha256.h>
 #ifdef NO_INLINE
-    #include <cyassl/ctaocrypt/ctc_misc.h>
+    #include <cyassl/ctaocrypt/misc.h>
 #else
-    #include "ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

ctaocrypt/src/sha512.c

@@ -26,11 +26,11 @@
 
 #ifdef CYASSL_SHA512
 
-#include "ctc_sha512.h"
+#include <cyassl/ctaocrypt/sha512.h>
 #ifdef NO_INLINE
-    #include "ctc_misc.h"
+    #include <cyassl/ctaocrypt/misc.h>
 #else
-    #include "ctc_misc.c"
+    #include <ctaocrypt/src/misc.c>
 #endif
 
 

ctaocrypt/src/tfm.c

@@ -35,12 +35,12 @@
 #endif
 
 /* in case user set USE_FAST_MATH there */
-#include <cyassl/ctaocrypt/ctc_settings.h>
+#include <cyassl/ctaocrypt/settings.h>
 
 #ifdef USE_FAST_MATH
 
-#include <cyassl/ctaocrypt/ctc_tfm.h>
-#include <ctaocrypt/src/ctc_asm.c>  /* will define asm MACROS or C ones */
+#include <cyassl/ctaocrypt/tfm.h>
+#include <ctaocrypt/src/asm.c>  /* will define asm MACROS or C ones */
 
 
 

ctaocrypt/test/test.c

@@ -26,30 +26,30 @@
 #include <stdlib.h>
 
 #ifdef CYASSL_TEST_CERT
-    #include <cyassl/ctaocrypt/ctc_asn.h>
+    #include <cyassl/ctaocrypt/asn.h>
 #else
-    #include <cyassl/ctaocrypt/ctc_asn_public.h>
+    #include <cyassl/ctaocrypt/asn_public.h>
 #endif
-#include <cyassl/ctaocrypt/ctc_md5.h>
-#include <cyassl/ctaocrypt/ctc_md4.h>
-#include <cyassl/ctaocrypt/ctc_sha.h>
-#include <cyassl/ctaocrypt/ctc_sha256.h>
-#include <cyassl/ctaocrypt/ctc_sha512.h>
-#include <cyassl/ctaocrypt/ctc_arc4.h>
-#include <cyassl/ctaocrypt/ctc_random.h>
-#include <cyassl/ctaocrypt/ctc_coding.h>
-#include <cyassl/ctaocrypt/ctc_rsa.h>
-#include <cyassl/ctaocrypt/ctc_des3.h>
-#include <cyassl/ctaocrypt/ctc_aes.h>
-#include <cyassl/ctaocrypt/ctc_hmac.h>
-#include <cyassl/ctaocrypt/ctc_dh.h>
-#include <cyassl/ctaocrypt/ctc_dsa.h>
-#include <cyassl/ctaocrypt/ctc_hc128.h>
-#include <cyassl/ctaocrypt/ctc_rabbit.h>
-#include <cyassl/ctaocrypt/ctc_pwdbased.h>
-#include <cyassl/ctaocrypt/ctc_ripemd.h>
+#include <cyassl/ctaocrypt/md5.h>
+#include <cyassl/ctaocrypt/md4.h>
+#include <cyassl/ctaocrypt/sha.h>
+#include <cyassl/ctaocrypt/sha256.h>
+#include <cyassl/ctaocrypt/sha512.h>
+#include <cyassl/ctaocrypt/arc4.h>
+#include <cyassl/ctaocrypt/random.h>
+#include <cyassl/ctaocrypt/coding.h>
+#include <cyassl/ctaocrypt/rsa.h>
+#include <cyassl/ctaocrypt/des3.h>
+#include <cyassl/ctaocrypt/aes.h>
+#include <cyassl/ctaocrypt/hmac.h>
+#include <cyassl/ctaocrypt/dh.h>
+#include <cyassl/ctaocrypt/dsa.h>
+#include <cyassl/ctaocrypt/hc128.h>
+#include <cyassl/ctaocrypt/rabbit.h>
+#include <cyassl/ctaocrypt/pwdbased.h>
+#include <cyassl/ctaocrypt/ripemd.h>
 #ifdef HAVE_ECC
-    #include <cyassl/ctaocrypt/ctc_ecc.h>
+    #include <cyassl/ctaocrypt/ecc.h>
 #endif    
 
 #ifdef _MSC_VER