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

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 <cyassl/ctaocrypt/types.h>
 
 #ifdef CYASSL_AESNI
 

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 <cyassl/ctaocrypt/types.h>
 
 
 #ifdef __cplusplus

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 <cyassl/ctaocrypt/types.h>
+#include <cyassl/ctaocrypt/rsa.h>
+#include <cyassl/ctaocrypt/dh.h>
+#include <cyassl/ctaocrypt/dsa.h>
+#include <cyassl/ctaocrypt/sha.h>
+#include <cyassl/ctaocrypt/asn_public.h>   /* public interface */
 #ifdef HAVE_ECC
-    #include "ctc_ecc.h"
+    #include <cyassl/ctaocrypt/ecc.h>
 #endif
 
 #ifdef __cplusplus

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 <cyassl/ctaocrypt/types.h>
 #ifdef CYASSL_CERT_GEN
-    #include "ctc_rsa.h"
+    #include <cyassl/ctaocrypt/rsa.h>
 #endif
 
 

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 <cyassl/ctaocrypt/types.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
 
 
 #ifdef __cplusplus

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 <cyassl/ctaocrypt/types.h>
+#include <cyassl/ctaocrypt/integer.h>
+#include <cyassl/ctaocrypt/random.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
+#include <cyassl/ctaocrypt/integer.h>
+#include <cyassl/ctaocrypt/random.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
+#include <cyassl/ctaocrypt/integer.h>
+#include <cyassl/ctaocrypt/random.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
 
 
 #ifdef __cplusplus

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 <cyassl/ctaocrypt/ctc_types.h>
+#include <cyassl/ctaocrypt/types.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/md5.h>
+#include <cyassl/ctaocrypt/sha.h>
 
 #ifndef NO_SHA256
-    #include "ctc_sha256.h"
+    #include <cyassl/ctaocrypt/sha256.h>
 #endif
 
 #ifdef __cplusplus

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

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 <cyassl/ctaocrypt/types.h>       /* will set MP_xxBIT if not default */
 #ifdef USE_FAST_MATH
-    #include "ctc_tfm.h"
+    #include <cyassl/ctaocrypt/tfm.h>
 #else
 
 #ifndef CHAR_BIT
     #include <limits.h>
 #endif
 
-#include "mpi_class.h"
+#include <cyassl/ctaocrypt/mpi_class.h>
 
 #ifndef MIN
    #define MIN(x,y) ((x)<(y)?(x):(y))

cyassl/ctaocrypt/logging.h

@@ -1,4 +1,4 @@
-/* cyassl_logging.h
+/* logging.h
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *

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 <cyassl/ctaocrypt/types.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
 
 #ifdef __cplusplus
     extern "C" {

cyassl/ctaocrypt/memory.h

@@ -1,4 +1,4 @@
-/* cyassl_memory.h
+/* memory.h
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *

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 <cyassl/ctaocrypt/types.h>
 
 
 #ifdef __cplusplus

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 <cyassl/ctaocrypt/types.h>
+#include <cyassl/ctaocrypt/md5.h>       /* for hash type */
+#include <cyassl/ctaocrypt/sha.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/arc4.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
+#include <cyassl/ctaocrypt/integer.h>
+#include <cyassl/ctaocrypt/random.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/ctc_visibility.h>
+#include <cyassl/ctaocrypt/visibility.h>
 
 #ifdef IPHONE
     #define SIZEOF_LONG_LONG 8

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 <cyassl/ctaocrypt/ctc_types.h>
+#include <cyassl/ctaocrypt/types.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
 
 #ifdef __cplusplus
     extern "C" {

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 <cyassl/ctaocrypt/types.h>
 #ifndef CHAR_BIT
     #include <limits.h>
 #endif

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 <cyassl/ctaocrypt/ctc_settings.h>
+#include <cyassl/ctaocrypt/settings.h>
 
 #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 <cyassl/ctaocrypt/memory.h>
     #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))

cyassl/ctaocrypt/visibility.h

@@ -1,4 +1,4 @@
-/* ctc_visibility.h
+/* visibility.h
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *

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 <cyassl/ctaocrypt/ctc_error.h>   /* CTaoCrypt errors */
+#include <cyassl/ctaocrypt/error.h>   /* pull in CTaoCrypt errors */
 
 #ifdef __cplusplus
     extern "C" {

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

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 <cyassl/ctaocrypt/ctc_types.h>
-#include <cyassl/ctaocrypt/ctc_random.h>
-#include <cyassl/ctaocrypt/ctc_des3.h>
-#include <cyassl/ctaocrypt/ctc_hc128.h>
-#include <cyassl/ctaocrypt/ctc_rabbit.h>
-#include <cyassl/ctaocrypt/ctc_asn.h>
-#include <cyassl/ctaocrypt/ctc_md5.h>
-#include <cyassl/ctaocrypt/ctc_aes.h>
-#include <cyassl/ctaocrypt/cyassl_logging.h>
+#include <cyassl/ctaocrypt/types.h>
+#include <cyassl/ctaocrypt/random.h>
+#include <cyassl/ctaocrypt/des3.h>
+#include <cyassl/ctaocrypt/hc128.h>
+#include <cyassl/ctaocrypt/rabbit.h>
+#include <cyassl/ctaocrypt/asn.h>
+#include <cyassl/ctaocrypt/md5.h>
+#include <cyassl/ctaocrypt/aes.h>
+#include <cyassl/ctaocrypt/logging.h>
 #ifdef HAVE_ECC
-    #include <cyassl/ctaocrypt/ctc_ecc.h>
+    #include <cyassl/ctaocrypt/ecc.h>
 #endif
 #ifndef NO_SHA256
-    #include <cyassl/ctaocrypt/ctc_sha256.h>
+    #include <cyassl/ctaocrypt/sha256.h>
 #endif
 
 #ifdef CYASSL_CALLBACKS
-    #include "cyassl_callbacks.h"
+    #include <cyassl/openssl/cyassl_callbacks.h>
     #include <signal.h>
 #endif
 

cyassl/openssl/cyassl_test.h

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <ctype.h>
-#include <cyassl/ctaocrypt/ctc_types.h>
+#include <cyassl/ctaocrypt/types.h>
 
 #ifdef USE_WINDOWS_API 
     #include <winsock2.h>

cyassl/openssl/ssl.h

@@ -29,7 +29,7 @@
 #define CYASSL_OPENSSL_H_
 
 /* for users not using preprocessor flags */
-#include <cyassl/ctaocrypt/ctc_settings.h>
+#include <cyassl/ctaocrypt/settings.h>
 
 #ifdef USE_CYASSL_VERSION
     #include <cyassl/version.h>

cyassl/sniffer.h

@@ -23,7 +23,7 @@
 #ifndef CYASSL_SNIFFER_H
 #define CYASSL_SNIFFER_H
 
-#include <cyassl/ctaocrypt/ctc_settings.h>
+#include <cyassl/ctaocrypt/settings.h>
 
 #ifdef _WIN32
     #ifdef SSL_SNIFFER_EXPORTS

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

src/internal.c

@@ -1,4 +1,4 @@
-/* cyassl_int.c
+/* internal.c
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *
@@ -24,9 +24,9 @@
     #include <config.h>
 #endif
 
-#include <cyassl/cyassl_int.h>
-#include <cyassl/cyassl_error.h>
-#include <cyassl/ctaocrypt/ctc_asn.h>
+#include <cyassl/internal.h>
+#include <cyassl/error.h>
+#include <cyassl/ctaocrypt/asn.h>
 
 #ifdef HAVE_LIBZ
     #include "zlib.h"

src/io.c

@@ -1,4 +1,4 @@
-/* cyassl_io.c
+/* io.c
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *
@@ -28,7 +28,7 @@
     #include <winsock2.h>
 #endif
 
-#include <cyassl/cyassl_int.h>
+#include <cyassl/internal.h>
 
 /* 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()

src/keys.c

@@ -24,8 +24,8 @@
     #include <config.h>
 #endif
 
-#include <cyassl/cyassl_int.h>
-#include <cyassl/cyassl_error.h>
+#include <cyassl/internal.h>
+#include <cyassl/error.h>
 #ifdef SHOW_SECRETS
     #include <stdio.h>
 #endif

src/ssl.c

@@ -31,9 +31,9 @@
 #define FALSE 0
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/cyassl_int.h>
-#include <cyassl/cyassl_error.h>
-#include <cyassl/ctaocrypt/ctc_coding.h>
+#include <cyassl/internal.h>
+#include <cyassl/error.h>
+#include <cyassl/ctaocrypt/coding.h>
 
 #if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)
     #include <cyassl/openssl/evp.h>
@@ -45,10 +45,10 @@
     #include <cyassl/openssl/crypto.h>
     #include <cyassl/openssl/des.h>
     /* openssl headers end, cyassl internal headers next */
-    #include <cyassl/ctaocrypt/ctc_hmac.h>
-    #include <cyassl/ctaocrypt/ctc_random.h>
-    #include <cyassl/ctaocrypt/ctc_des3.h>
-    #include <cyassl/ctaocrypt/ctc_md4.h>
+    #include <cyassl/ctaocrypt/hmac.h>
+    #include <cyassl/ctaocrypt/random.h>
+    #include <cyassl/ctaocrypt/des3.h>
+    #include <cyassl/ctaocrypt/md4.h>
 #endif
 
 

src/tls.c

@@ -24,9 +24,9 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/cyassl_int.h>
-#include <cyassl/cyassl_error.h>
-#include <cyassl/ctaocrypt/ctc_hmac.h>
+#include <cyassl/internal.h>
+#include <cyassl/error.h>
+#include <cyassl/ctaocrypt/hmac.h>
 
 
 

swig/cyassl_adds.c

@@ -28,8 +28,8 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/ctaocrypt/ctc_rsa.h>
-#include <cyassl/ctaocrypt/ctc_asn.h>
+#include <cyassl/ctaocrypt/rsa.h>
+#include <cyassl/ctaocrypt/asn.h>
 
 #include <stdio.h>
 #include <stdlib.h>

testsuite/testsuite.c

@@ -25,7 +25,7 @@
 
 #include <cyassl/openssl/ssl.h>
 #include <cyassl/openssl/cyassl_test.h>
-#include <cyassl/ctaocrypt/ctc_md5.h>
+#include <cyassl/ctaocrypt/md5.h>
 
 #ifdef SINGLE_THREADED
     #error testsuite needs threads to run, please run ctaocrypt/test, \