WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/1/head
Todd A Ouska 2011-08-25 12:41:19 -07:00
parent c17ba33ebb
commit 5619fa81fa
72 changed files with 269 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ctaocrypt/benchmark/benchmark.c
View File

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

10
ctaocrypt/src/aes.c
View File

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

2
ctaocrypt/src/arc4.c
View File

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

2
ctaocrypt/src/ctc_asm.c → ctaocrypt/src/asm.c
View File

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

20
ctaocrypt/src/asn.c
View File

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

6
ctaocrypt/src/coding.c
View File

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

6
ctaocrypt/src/cyassl_memory.c
View File

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

6
ctaocrypt/src/des3.c
View File

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

4
ctaocrypt/src/dh.c
View File

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

8
ctaocrypt/src/dsa.c
View File

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

6
ctaocrypt/src/hc128.c
View File

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

4
ctaocrypt/src/hmac.c
View File

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

4
ctaocrypt/src/integer.c
View File

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

6
ctaocrypt/src/logging.c
View File

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

6
ctaocrypt/src/md4.c
View File

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

6
ctaocrypt/src/md5.c
View File

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

4
ctaocrypt/src/ctc_misc.c → ctaocrypt/src/misc.c
View File

@ -1,4 +1,4 @@
/* ctc_misc.c /* misc.c
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -23,7 +23,7 @@
#include <config.h> #include <config.h>
#endif #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, /* 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., because the functions are smaller than function call setup/cleanup, e.g.,

14
ctaocrypt/src/pwdbased.c
View File

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

6
ctaocrypt/src/rabbit.c
View File

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

4
ctaocrypt/src/random.c
View File

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

6
ctaocrypt/src/ripemd.c
View File

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

8
ctaocrypt/src/rsa.c
View File

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

6
ctaocrypt/src/sha.c
View File

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

6
ctaocrypt/src/sha256.c
View File

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

6
ctaocrypt/src/sha512.c
View File

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

6
ctaocrypt/src/tfm.c
View File

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

42
ctaocrypt/test/test.c
View File

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

4
cyassl/ctaocrypt/ctc_aes.h → cyassl/ctaocrypt/aes.h
View File

@ -1,4 +1,4 @@
/* ctc_aes.h /* aes.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -26,7 +26,7 @@
#define CTAO_CRYPT_AES_H #define CTAO_CRYPT_AES_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef CYASSL_AESNI #ifdef CYASSL_AESNI

4
cyassl/ctaocrypt/ctc_arc4.h → cyassl/ctaocrypt/arc4.h
View File

@ -1,4 +1,4 @@
/* ctc_arc4.h /* arc4.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -24,7 +24,7 @@
#define CTAO_CRYPT_ARC4_H #define CTAO_CRYPT_ARC4_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus

16
cyassl/ctaocrypt/ctc_asn.h → cyassl/ctaocrypt/asn.h
View File

@ -1,4 +1,4 @@
/* ctc_asn.h /* asn.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -23,14 +23,14 @@
#ifndef CTAO_CRYPT_ASN_H #ifndef CTAO_CRYPT_ASN_H
#define CTAO_CRYPT_ASN_H #define CTAO_CRYPT_ASN_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#include "ctc_rsa.h" #include <cyassl/ctaocrypt/rsa.h>
#include "ctc_dh.h" #include <cyassl/ctaocrypt/dh.h>
#include "ctc_dsa.h" #include <cyassl/ctaocrypt/dsa.h>
#include "ctc_sha.h" #include <cyassl/ctaocrypt/sha.h>
#include "ctc_asn_public.h" /* public interface */ #include <cyassl/ctaocrypt/asn_public.h> /* public interface */
#ifdef HAVE_ECC #ifdef HAVE_ECC
#include "ctc_ecc.h" #include <cyassl/ctaocrypt/ecc.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

6
cyassl/ctaocrypt/ctc_asn_public.h → cyassl/ctaocrypt/asn_public.h
View File

@ -1,4 +1,4 @@
/* ctc_asn_public.h /* asn_public.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -23,9 +23,9 @@
#ifndef CTAO_CRYPT_ASN_PUBLIC_H #ifndef CTAO_CRYPT_ASN_PUBLIC_H
#define CTAO_CRYPT_ASN_PUBLIC_H #define CTAO_CRYPT_ASN_PUBLIC_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef CYASSL_CERT_GEN #ifdef CYASSL_CERT_GEN
#include "ctc_rsa.h" #include <cyassl/ctaocrypt/rsa.h>
#endif #endif

4
cyassl/ctaocrypt/ctc_coding.h → cyassl/ctaocrypt/coding.h
View File

@ -1,4 +1,4 @@
/* ctc_coding.h /* coding.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -23,7 +23,7 @@
#ifndef CTAO_CRYPT_CODING_H #ifndef CTAO_CRYPT_CODING_H
#define CTAO_CRYPT_CODING_H #define CTAO_CRYPT_CODING_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
cyassl/ctaocrypt/ctc_des3.h → cyassl/ctaocrypt/des3.h
View File

@ -1,4 +1,4 @@
/* ctc_des3.h /* des3.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -26,7 +26,7 @@
#define CTAO_CRYPT_DES3_H #define CTAO_CRYPT_DES3_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus

8
cyassl/ctaocrypt/ctc_dh.h → cyassl/ctaocrypt/dh.h
View File

@ -1,4 +1,4 @@
/* ctc_dh.h /* dh.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -25,9 +25,9 @@
#ifndef CTAO_CRYPT_DH_H #ifndef CTAO_CRYPT_DH_H
#define CTAO_CRYPT_DH_H #define CTAO_CRYPT_DH_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#include "ctc_integer.h" #include <cyassl/ctaocrypt/integer.h>
#include "ctc_random.h" #include <cyassl/ctaocrypt/random.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
cyassl/ctaocrypt/ctc_dsa.h → cyassl/ctaocrypt/dsa.h
View File

@ -1,4 +1,4 @@
/* ctc_dsa.h /* dsa.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -25,9 +25,9 @@
#ifndef CTAO_CRYPT_DSA_H #ifndef CTAO_CRYPT_DSA_H
#define CTAO_CRYPT_DSA_H #define CTAO_CRYPT_DSA_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#include "ctc_integer.h" #include <cyassl/ctaocrypt/integer.h>
#include "ctc_random.h" #include <cyassl/ctaocrypt/random.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
cyassl/ctaocrypt/ctc_ecc.h → cyassl/ctaocrypt/ecc.h
View File

@ -1,4 +1,4 @@
/* ctc_ecc.h /* ecc.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -24,9 +24,9 @@
#ifndef CTAO_CRYPT_ECC_H #ifndef CTAO_CRYPT_ECC_H
#define CTAO_CRYPT_ECC_H #define CTAO_CRYPT_ECC_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#include "ctc_integer.h" #include <cyassl/ctaocrypt/integer.h>
#include "ctc_random.h" #include <cyassl/ctaocrypt/random.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
cyassl/ctaocrypt/ctc_error.h → cyassl/ctaocrypt/error.h
View File

@ -1,4 +1,4 @@
/* ctc_error.h /* error.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -23,7 +23,7 @@
#ifndef CTAO_CRYPT_ERROR_H #ifndef CTAO_CRYPT_ERROR_H
#define CTAO_CRYPT_ERROR_H #define CTAO_CRYPT_ERROR_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus

4
cyassl/ctaocrypt/ctc_hc128.h → cyassl/ctaocrypt/hc128.h
View File

@ -1,4 +1,4 @@
/* ctc_hc128.h /* hc128.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -25,7 +25,7 @@
#ifndef CTAO_CRYPT_HC128_H #ifndef CTAO_CRYPT_HC128_H
#define CTAO_CRYPT_HC128_H #define CTAO_CRYPT_HC128_H
#include <cyassl/ctaocrypt/ctc_types.h> #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
cyassl/ctaocrypt/ctc_hmac.h → cyassl/ctaocrypt/hmac.h
View File

@ -1,4 +1,4 @@
/* ctc_hmac.h /* hmac.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -25,11 +25,11 @@
#ifndef CTAO_CRYPT_HMAC_H #ifndef CTAO_CRYPT_HMAC_H
#define CTAO_CRYPT_HMAC_H #define CTAO_CRYPT_HMAC_H
#include "ctc_md5.h" #include <cyassl/ctaocrypt/md5.h>
#include "ctc_sha.h" #include <cyassl/ctaocrypt/sha.h>
#ifndef NO_SHA256 #ifndef NO_SHA256
#include "ctc_sha256.h" #include <cyassl/ctaocrypt/sha256.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

60
cyassl/ctaocrypt/include.am
View File

@ -2,35 +2,35 @@
# All paths should be given relative to the root # All paths should be given relative to the root
nobase_include_HEADERS+= \ nobase_include_HEADERS+= \
cyassl/ctaocrypt/ctc_aes.h \ cyassl/ctaocrypt/aes.h \
cyassl/ctaocrypt/ctc_arc4.h \ cyassl/ctaocrypt/arc4.h \
cyassl/ctaocrypt/ctc_asn.h \ cyassl/ctaocrypt/asn.h \
cyassl/ctaocrypt/ctc_asn_public.h \ cyassl/ctaocrypt/asn_public.h \
cyassl/ctaocrypt/ctc_coding.h \ cyassl/ctaocrypt/coding.h \
cyassl/ctaocrypt/ctc_des3.h \ cyassl/ctaocrypt/des3.h \
cyassl/ctaocrypt/ctc_dh.h \ cyassl/ctaocrypt/dh.h \
cyassl/ctaocrypt/ctc_dsa.h \ cyassl/ctaocrypt/dsa.h \
cyassl/ctaocrypt/ctc_ecc.h \ cyassl/ctaocrypt/ecc.h \
cyassl/ctaocrypt/ctc_error.h \ cyassl/ctaocrypt/error.h \
cyassl/ctaocrypt/ctc_hc128.h \ cyassl/ctaocrypt/hc128.h \
cyassl/ctaocrypt/ctc_hmac.h \ cyassl/ctaocrypt/hmac.h \
cyassl/ctaocrypt/ctc_integer.h \ cyassl/ctaocrypt/integer.h \
cyassl/ctaocrypt/ctc_md4.h \ cyassl/ctaocrypt/md4.h \
cyassl/ctaocrypt/ctc_md5.h \ cyassl/ctaocrypt/md5.h \
cyassl/ctaocrypt/ctc_misc.h \ cyassl/ctaocrypt/misc.h \
cyassl/ctaocrypt/ctc_pwdbased.h \ cyassl/ctaocrypt/pwdbased.h \
cyassl/ctaocrypt/ctc_rabbit.h \ cyassl/ctaocrypt/rabbit.h \
cyassl/ctaocrypt/ctc_random.h \ cyassl/ctaocrypt/random.h \
cyassl/ctaocrypt/ctc_ripemd.h \ cyassl/ctaocrypt/ripemd.h \
cyassl/ctaocrypt/ctc_rsa.h \ cyassl/ctaocrypt/rsa.h \
cyassl/ctaocrypt/ctc_settings.h \ cyassl/ctaocrypt/settings.h \
cyassl/ctaocrypt/ctc_sha256.h \ cyassl/ctaocrypt/sha256.h \
cyassl/ctaocrypt/ctc_sha512.h \ cyassl/ctaocrypt/sha512.h \
cyassl/ctaocrypt/ctc_sha.h \ cyassl/ctaocrypt/sha.h \
cyassl/ctaocrypt/ctc_tfm.h \ cyassl/ctaocrypt/tfm.h \
cyassl/ctaocrypt/ctc_types.h \ cyassl/ctaocrypt/types.h \
cyassl/ctaocrypt/ctc_visibility.h \ cyassl/ctaocrypt/visibility.h \
cyassl/ctaocrypt/cyassl_logging.h \ cyassl/ctaocrypt/logging.h \
cyassl/ctaocrypt/cyassl_memory.h \ cyassl/ctaocrypt/memory.h \
cyassl/ctaocrypt/mpi_class.h \ cyassl/ctaocrypt/mpi_class.h \
cyassl/ctaocrypt/mpi_superclass.h cyassl/ctaocrypt/mpi_superclass.h

8
cyassl/ctaocrypt/ctc_integer.h → cyassl/ctaocrypt/integer.h
View File

@ -1,4 +1,4 @@
/* ctc_integer.h /* integer.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * 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 optionally use fast math instead, not yet supported on all platforms and
may not be faster on all 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 #ifdef USE_FAST_MATH
#include "ctc_tfm.h" #include <cyassl/ctaocrypt/tfm.h>
#else #else
#ifndef CHAR_BIT #ifndef CHAR_BIT
#include <limits.h> #include <limits.h>
#endif #endif
#include "mpi_class.h" #include <cyassl/ctaocrypt/mpi_class.h>
#ifndef MIN #ifndef MIN
#define MIN(x,y) ((x)<(y)?(x):(y)) #define MIN(x,y) ((x)<(y)?(x):(y))

2
cyassl/ctaocrypt/cyassl_logging.h → cyassl/ctaocrypt/logging.h
View File

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

4
cyassl/ctaocrypt/ctc_md4.h → cyassl/ctaocrypt/md4.h
View File

@ -1,4 +1,4 @@
/* ctc_md4.h /* md4.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -25,7 +25,7 @@
#ifndef CTAO_CRYPT_MD4_H #ifndef CTAO_CRYPT_MD4_H
#define CTAO_CRYPT_MD4_H #define CTAO_CRYPT_MD4_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
cyassl/ctaocrypt/ctc_md5.h → cyassl/ctaocrypt/md5.h
View File

@ -1,4 +1,4 @@
/* ctc_md5.h /* md5.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -23,7 +23,7 @@
#ifndef CTAO_CRYPT_MD5_H #ifndef CTAO_CRYPT_MD5_H
#define CTAO_CRYPT_MD5_H #define CTAO_CRYPT_MD5_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
cyassl/ctaocrypt/cyassl_memory.h → cyassl/ctaocrypt/memory.h
View File

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

4
cyassl/ctaocrypt/ctc_misc.h → cyassl/ctaocrypt/misc.h
View File

@ -1,4 +1,4 @@
/* ctc_misc.h /* misc.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -24,7 +24,7 @@
#define CTAO_CRYPT_MISC_H #define CTAO_CRYPT_MISC_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus

8
cyassl/ctaocrypt/ctc_pwdbased.h → cyassl/ctaocrypt/pwdbased.h
View File

@ -1,4 +1,4 @@
/* ctc_pwdbased.h /* pwdbased.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -25,9 +25,9 @@
#ifndef CTAO_CRYPT_PWDBASED_H #ifndef CTAO_CRYPT_PWDBASED_H
#define CTAO_CRYPT_PWDBASED_H #define CTAO_CRYPT_PWDBASED_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#include "ctc_md5.h" /* for hash type */ #include <cyassl/ctaocrypt/md5.h> /* for hash type */
#include "ctc_sha.h" #include <cyassl/ctaocrypt/sha.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
cyassl/ctaocrypt/ctc_rabbit.h → cyassl/ctaocrypt/rabbit.h
View File

@ -1,4 +1,4 @@
/* ctc_rabbit.h /* rabbit.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -25,7 +25,7 @@
#ifndef CTAO_CRYPT_RABBIT_H #ifndef CTAO_CRYPT_RABBIT_H
#define CTAO_CRYPT_RABBIT_H #define CTAO_CRYPT_RABBIT_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
cyassl/ctaocrypt/ctc_random.h → cyassl/ctaocrypt/random.h
View File

@ -1,4 +1,4 @@
/* ctc_random.h /* random.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -23,7 +23,7 @@
#ifndef CTAO_CRYPT_RANDOM_H #ifndef CTAO_CRYPT_RANDOM_H
#define CTAO_CRYPT_RANDOM_H #define CTAO_CRYPT_RANDOM_H
#include "ctc_arc4.h" #include <cyassl/ctaocrypt/arc4.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
cyassl/ctaocrypt/ctc_ripemd.h → cyassl/ctaocrypt/ripemd.h
View File

@ -1,4 +1,4 @@
/* ctc_ripemd.h /* ripemd.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -25,7 +25,7 @@
#ifndef CTAO_CRYPT_RIPEMD_H #ifndef CTAO_CRYPT_RIPEMD_H
#define CTAO_CRYPT_RIPEME_H #define CTAO_CRYPT_RIPEME_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
cyassl/ctaocrypt/ctc_rsa.h → cyassl/ctaocrypt/rsa.h
View File

@ -1,4 +1,4 @@
/* ctc_rsa.h /* rsa.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -23,9 +23,9 @@
#ifndef CTAO_CRYPT_RSA_H #ifndef CTAO_CRYPT_RSA_H
#define CTAO_CRYPT_RSA_H #define CTAO_CRYPT_RSA_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#include "ctc_integer.h" #include <cyassl/ctaocrypt/integer.h>
#include "ctc_random.h" #include <cyassl/ctaocrypt/random.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

6
cyassl/ctaocrypt/ctc_settings.h → cyassl/ctaocrypt/settings.h
View File

@ -1,4 +1,4 @@
/* ctc_settings.h /* settings.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -20,7 +20,7 @@
*/ */
/* Place OS specific preprocessor flags, defines, includes here, will be /* 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 #ifndef CTAO_CRYPT_SETTINGS_H
@ -54,7 +54,7 @@
/* Uncomment next line if builing yaSSL with autoconf and want version string */ /* Uncomment next line if builing yaSSL with autoconf and want version string */
/* #define USE_CYASSL_VERSION */ /* #define USE_CYASSL_VERSION */
#include <cyassl/ctaocrypt/ctc_visibility.h> #include <cyassl/ctaocrypt/visibility.h>
#ifdef IPHONE #ifdef IPHONE
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8

5
cyassl/ctaocrypt/ctc_sha.h → cyassl/ctaocrypt/sha.h
View File

@ -1,4 +1,4 @@
/* ctc_sha.h /* sha.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -20,11 +20,10 @@
*/ */
#pragma once
#ifndef CTAO_CRYPT_SHA_H #ifndef CTAO_CRYPT_SHA_H
#define CTAO_CRYPT_SHA_H #define CTAO_CRYPT_SHA_H
#include <cyassl/ctaocrypt/ctc_types.h> #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
cyassl/ctaocrypt/ctc_sha256.h → cyassl/ctaocrypt/sha256.h
View File

@ -1,4 +1,4 @@
/* ctc_sha256.h /* sha256.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -28,7 +28,7 @@
#ifndef CTAO_CRYPT_SHA256_H #ifndef CTAO_CRYPT_SHA256_H
#define CTAO_CRYPT_SHA256_H #define CTAO_CRYPT_SHA256_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
cyassl/ctaocrypt/ctc_sha512.h → cyassl/ctaocrypt/sha512.h
View File

@ -1,4 +1,4 @@
/* ctc_sha512.h /* sha512.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -25,7 +25,7 @@
#ifndef CTAO_CRYPT_SHA512_H #ifndef CTAO_CRYPT_SHA512_H
#define CTAO_CRYPT_SHA512_H #define CTAO_CRYPT_SHA512_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
cyassl/ctaocrypt/ctc_tfm.h → cyassl/ctaocrypt/tfm.h
View File

@ -1,4 +1,4 @@
/* ctc_tfm.h /* tfm.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -35,7 +35,7 @@
#ifndef CTAO_CRYPT_TFM_H #ifndef CTAO_CRYPT_TFM_H
#define CTAO_CRYPT_TFM_H #define CTAO_CRYPT_TFM_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/types.h>
#ifndef CHAR_BIT #ifndef CHAR_BIT
#include <limits.h> #include <limits.h>
#endif #endif

6
cyassl/ctaocrypt/ctc_types.h → cyassl/ctaocrypt/types.h
View File

@ -1,4 +1,4 @@
/* ctc_types.h /* types.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -23,7 +23,7 @@
#ifndef CTAO_CRYPT_TYPES_H #ifndef CTAO_CRYPT_TYPES_H
#define CTAO_CRYPT_TYPES_H #define CTAO_CRYPT_TYPES_H
#include <cyassl/ctaocrypt/ctc_settings.h> #include <cyassl/ctaocrypt/settings.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -131,7 +131,7 @@ enum {
extern void XFREE(void *p, void* heap, int type); extern void XFREE(void *p, void* heap, int type);
#elif !defined(MICRIUM_MALLOC) #elif !defined(MICRIUM_MALLOC)
/* default C runtime, can install different routines at runtime */ /* 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 XMALLOC(s, h, t) CyaSSL_Malloc((s))
#define XFREE(p, h, t) {void* xp = (p); if((xp)) CyaSSL_Free((xp));} #define XFREE(p, h, t) {void* xp = (p); if((xp)) CyaSSL_Free((xp));}
#define XREALLOC(p, n, h, t) CyaSSL_Realloc((p), (n)) #define XREALLOC(p, n, h, t) CyaSSL_Realloc((p), (n))

2
cyassl/ctaocrypt/ctc_visibility.h → cyassl/ctaocrypt/visibility.h
View File

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

4
cyassl/cyassl_error.h → cyassl/error.h
View File

@ -1,4 +1,4 @@
/* cyassl_error.h /* error.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -23,7 +23,7 @@
#ifndef CYASSL_ERROR_H #ifndef CYASSL_ERROR_H
#define 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 #ifdef __cplusplus
extern "C" { extern "C" {

4
cyassl/include.am
View File

@ -8,8 +8,8 @@ include cyassl/openssl/include.am
EXTRA_DIST+= cyassl/sniffer_error.rc EXTRA_DIST+= cyassl/sniffer_error.rc
nobase_include_HEADERS+= \ nobase_include_HEADERS+= \
cyassl/cyassl_error.h \ cyassl/error.h \
cyassl/cyassl_int.h \ cyassl/internal.h \
cyassl/sniffer_error.h \ cyassl/sniffer_error.h \
cyassl/sniffer.h \ cyassl/sniffer.h \
cyassl/version.h cyassl/version.h

26
cyassl/cyassl_int.h → cyassl/internal.h
View File

@ -1,4 +1,4 @@
/* cyassl_int.h /* internal.h
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -24,24 +24,24 @@
#define CYASSL_INT_H #define CYASSL_INT_H
#include <cyassl/ctaocrypt/ctc_types.h> #include <cyassl/ctaocrypt/types.h>
#include <cyassl/ctaocrypt/ctc_random.h> #include <cyassl/ctaocrypt/random.h>
#include <cyassl/ctaocrypt/ctc_des3.h> #include <cyassl/ctaocrypt/des3.h>
#include <cyassl/ctaocrypt/ctc_hc128.h> #include <cyassl/ctaocrypt/hc128.h>
#include <cyassl/ctaocrypt/ctc_rabbit.h> #include <cyassl/ctaocrypt/rabbit.h>
#include <cyassl/ctaocrypt/ctc_asn.h> #include <cyassl/ctaocrypt/asn.h>
#include <cyassl/ctaocrypt/ctc_md5.h> #include <cyassl/ctaocrypt/md5.h>
#include <cyassl/ctaocrypt/ctc_aes.h> #include <cyassl/ctaocrypt/aes.h>
#include <cyassl/ctaocrypt/cyassl_logging.h> #include <cyassl/ctaocrypt/logging.h>
#ifdef HAVE_ECC #ifdef HAVE_ECC
#include <cyassl/ctaocrypt/ctc_ecc.h> #include <cyassl/ctaocrypt/ecc.h>
#endif #endif
#ifndef NO_SHA256 #ifndef NO_SHA256
#include <cyassl/ctaocrypt/ctc_sha256.h> #include <cyassl/ctaocrypt/sha256.h>
#endif #endif
#ifdef CYASSL_CALLBACKS #ifdef CYASSL_CALLBACKS
#include "cyassl_callbacks.h" #include <cyassl/openssl/cyassl_callbacks.h>
#include <signal.h> #include <signal.h>
#endif #endif

2
cyassl/openssl/cyassl_test.h
View File

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

2
cyassl/openssl/ssl.h
View File

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

2
cyassl/sniffer.h
View File

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

6
src/include.am
View File

@ -4,8 +4,8 @@
lib_LTLIBRARIES+= src/libcyassl.la lib_LTLIBRARIES+= src/libcyassl.la
src_libcyassl_la_SOURCES = \ src_libcyassl_la_SOURCES = \
src/cyassl_int.c \ src/internal.c \
src/cyassl_io.c \ src/io.c \
src/keys.c \ src/keys.c \
src/ssl.c \ src/ssl.c \
src/tls.c \ src/tls.c \
@ -53,7 +53,7 @@ src_libcyassl_la_SOURCES += ctaocrypt/src/hc128.c
endif endif
if BUILD_NOINLINE if BUILD_NOINLINE
src_libcyassl_la_SOURCES += ctaocrypt/src/ctc_misc.c src_libcyassl_la_SOURCES += ctaocrypt/src/misc.c
endif endif
if BUILD_FASTMATH if BUILD_FASTMATH

8
src/cyassl_int.c → src/internal.c
View File

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

4
src/cyassl_io.c → src/io.c
View File

@ -1,4 +1,4 @@
/* cyassl_io.c /* io.c
* *
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
* *
@ -28,7 +28,7 @@
#include <winsock2.h> #include <winsock2.h>
#endif #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 /* 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() automatic setting of default I/O functions EmbedSend() and EmbedReceive()

4
src/keys.c
View File

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

14
src/ssl.c
View File

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

6
src/tls.c
View File

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

4
swig/cyassl_adds.c
View File

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

2
testsuite/testsuite.c
View File

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