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

resolve pull request merge conflict

pull/1/head
toddouska 2014-03-25 11:39:07 -07:00
parent 8c5d958a8b
commit fb6d671629
38 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IDE/MDK-ARM/MDK-ARM/CyaSSL/ssl-dummy.c
View File

@ -25,7 +25,7 @@
#include <cyassl/ssl.h>
#include <cyassl/internal.h>
#include <cyassl/error.h>
#include <cyassl/error-ssl.h>
#include <cyassl/ctaocrypt/coding.h>
Signer* GetCA(void* vp, byte* hash)

2
ctaocrypt/ctaocrypt.vcproj
View File

@ -177,7 +177,7 @@
>
</File>
<File
RelativePath=".\include\error.h"
RelativePath=".\include\error-crypt.h"
>
</File>
<File

3
ctaocrypt/src/aes.c
View File

@ -33,7 +33,7 @@
#endif
#include <cyassl/ctaocrypt/aes.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#include <cyassl/ctaocrypt/logging.h>
#ifdef NO_INLINE
#include <cyassl/ctaocrypt/misc.h>
@ -3493,3 +3493,4 @@ static int AesCaviumCbcDecrypt(Aes* aes, byte* out, const byte* in,
#endif /* NO_AES */

2
ctaocrypt/src/asn.c
View File

@ -38,7 +38,7 @@
#include <cyassl/ctaocrypt/sha.h>
#include <cyassl/ctaocrypt/md5.h>
#include <cyassl/ctaocrypt/md2.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#include <cyassl/ctaocrypt/pwdbased.h>
#include <cyassl/ctaocrypt/des3.h>
#include <cyassl/ctaocrypt/sha256.h>

2
ctaocrypt/src/camellia.c
View File

@ -61,7 +61,7 @@
#ifdef HAVE_CAMELLIA
#include <cyassl/ctaocrypt/camellia.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#include <cyassl/ctaocrypt/logging.h>
#ifdef NO_INLINE
#include <cyassl/ctaocrypt/misc.h>

2
ctaocrypt/src/coding.c
View File

@ -28,7 +28,7 @@
#ifndef NO_CODING
#include <cyassl/ctaocrypt/coding.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#include <cyassl/ctaocrypt/logging.h>

2
ctaocrypt/src/compress.c
View File

@ -30,7 +30,7 @@
#include <cyassl/ctaocrypt/compress.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#include <cyassl/ctaocrypt/logging.h>
#ifdef NO_INLINE
#include <cyassl/ctaocrypt/misc.h>

2
ctaocrypt/src/dh.c
View File

@ -28,7 +28,7 @@
#ifndef NO_DH
#include <cyassl/ctaocrypt/dh.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#ifndef USER_MATH_LIB
#include <math.h>

2
ctaocrypt/src/dsa.c
View File

@ -30,7 +30,7 @@
#include <cyassl/ctaocrypt/dsa.h>
#include <cyassl/ctaocrypt/sha.h>
#include <cyassl/ctaocrypt/random.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
enum {

2
ctaocrypt/src/ecc.c
View File

@ -31,7 +31,7 @@
#include <cyassl/ctaocrypt/ecc.h>
#include <cyassl/ctaocrypt/asn.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#ifdef HAVE_ECC_ENCRYPT
#include <cyassl/ctaocrypt/hmac.h>

2
ctaocrypt/src/error.c
View File

@ -25,7 +25,7 @@
#include <cyassl/ctaocrypt/settings.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#ifdef _MSC_VER
/* 4996 warning to use MS extensions e.g., strcpy_s instead of XSTRNCPY */

2
ctaocrypt/src/hc128.c
View File

@ -28,7 +28,7 @@
#ifdef HAVE_HC128
#include <cyassl/ctaocrypt/hc128.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#include <cyassl/ctaocrypt/logging.h>
#ifdef NO_INLINE
#include <cyassl/ctaocrypt/hc128.h>

2
ctaocrypt/src/hmac.c
View File

@ -44,7 +44,7 @@
#endif
#include <cyassl/ctaocrypt/hmac.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#ifdef HAVE_CAVIUM

2
ctaocrypt/src/logging.c
View File

@ -28,7 +28,7 @@
/* submitted by eof */
#include <cyassl/ctaocrypt/logging.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#ifdef __cplusplus

2
ctaocrypt/src/memory.c
View File

@ -28,7 +28,7 @@
#ifdef USE_CYASSL_MEMORY
#include <cyassl/ctaocrypt/memory.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#ifdef CYASSL_MALLOC_CHECK
#include <stdio.h>

2
ctaocrypt/src/pkcs7.c
View File

@ -28,7 +28,7 @@
#ifdef HAVE_PKCS7
#include <cyassl/ctaocrypt/pkcs7.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#include <cyassl/ctaocrypt/logging.h>
#ifndef min

4
ctaocrypt/src/port.c
View File

@ -25,7 +25,7 @@
#include <cyassl/ctaocrypt/settings.h>
#include <cyassl/ctaocrypt/types.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#ifdef _MSC_VER
@ -352,7 +352,7 @@ int UnLockMutex(CyaSSL_Mutex *m)
return BAD_MUTEX_E;
}
#elif defined(CYASSL_MDK_ARM)
#elif defined(CYASSL_MDK_ARM)|| defined(CYASSL_CMSIS_RTOS)
#if defined(CYASSL_CMSIS_RTOS)
#include "cmsis_os.h"

2
ctaocrypt/src/pwdbased.c
View File

@ -46,7 +46,7 @@
#include <cyassl/ctaocrypt/pwdbased.h>
#include <cyassl/ctaocrypt/hmac.h>
#include <cyassl/ctaocrypt/integer.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#if defined(CYASSL_SHA512) || defined(CYASSL_SHA384)
#include <cyassl/ctaocrypt/sha512.h>
#endif

2
ctaocrypt/src/rabbit.c
View File

@ -28,7 +28,7 @@
#ifndef NO_RABBIT
#include <cyassl/ctaocrypt/rabbit.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#include <cyassl/ctaocrypt/logging.h>
#ifdef NO_INLINE
#include <cyassl/ctaocrypt/misc.h>

2
ctaocrypt/src/random.c
View File

@ -31,7 +31,7 @@
*/
#include <cyassl/ctaocrypt/random.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#ifdef NO_RC4
#include <cyassl/ctaocrypt/sha256.h>

2
ctaocrypt/src/rsa.c
View File

@ -30,7 +30,7 @@
#include <cyassl/ctaocrypt/rsa.h>
#include <cyassl/ctaocrypt/random.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#include <cyassl/ctaocrypt/logging.h>
#ifdef SHOW_GEN

3
cyassl/ctaocrypt/error.h → cyassl/ctaocrypt/error-crypt.h
View File

@ -1,4 +1,4 @@
/* error.h
/* error-crypt.h
*
* Copyright (C) 2006-2013 wolfSSL Inc.
*
@ -136,3 +136,4 @@ CYASSL_API void CTaoCryptErrorString(int err, char* buff);
#endif /* CTAO_CRYPT_ERROR_H */

2
cyassl/ctaocrypt/include.am
View File

@ -13,7 +13,7 @@ nobase_include_HEADERS+= \
cyassl/ctaocrypt/dh.h \
cyassl/ctaocrypt/dsa.h \
cyassl/ctaocrypt/ecc.h \
cyassl/ctaocrypt/error.h \
cyassl/ctaocrypt/error-crypt.h \
cyassl/ctaocrypt/fips_test.h \
cyassl/ctaocrypt/hc128.h \
cyassl/ctaocrypt/hmac.h \

4
cyassl/ctaocrypt/port.h
View File

@ -60,6 +60,8 @@
#else
#include <rtl.h>
#endif
#elif defined(CYASSL_CMSIS_RTOS)
#include "cmsis_os.h"
#else
#ifndef SINGLE_THREADED
#define CYASSL_PTHREADS
@ -100,6 +102,8 @@
#else
typedef OS_MUT CyaSSL_Mutex;
#endif
#elif defined(CYASSL_CMSIS_RTOS)
typedef osMutexId CyaSSL_Mutex;
#else
#error Need a mutex type in multithreaded mode
#endif /* USE_WINDOWS_API */

10
cyassl/ctaocrypt/settings.h
View File

@ -167,15 +167,21 @@
#endif
#ifdef MBED
#define SINGLE_THREADED
//#define SINGLE_THREADED
#define CYASSL_USER_IO
#define NO_FILESYSTEM
#define NO_CERT
#define USE_CERT_BUFFERS_1024
#define NO_WRITEV
#define NO_DEV_RANDOM
#define NO_SHA512
#define NO_DH
#define NO_DSA
#define NO_HC128
#endif /* MBED */
#define HAVE_ECC
#define NO_SESSION_CACHE
#define CYASSL_CMSIS_RTOS
#endif
#ifdef CYASSL_TYTO
#include "rand.h"

5
cyassl/error.h → cyassl/error-ssl.h
View File

@ -1,4 +1,4 @@
/* error.h
/* error-ssl.h
*
* Copyright (C) 2006-2013 wolfSSL Inc.
*
@ -23,7 +23,7 @@
#ifndef CYASSL_ERROR_H
#define CYASSL_ERROR_H
#include <cyassl/ctaocrypt/error.h> /* pull in CTaoCrypt errors */
#include <cyassl/ctaocrypt/error-crypt.h> /* pull in CTaoCrypt errors */
#ifdef __cplusplus
extern "C" {
@ -143,3 +143,4 @@ void SetErrorString(int err, char* buff);
#endif /* CyaSSL_ERROR_H */

2
cyassl/include.am
View File

@ -8,7 +8,7 @@ include cyassl/openssl/include.am
EXTRA_DIST+= cyassl/sniffer_error.rc
nobase_include_HEADERS+= \
cyassl/error.h \
cyassl/error-ssl.h \
cyassl/ssl.h \
cyassl/sniffer_error.h \
cyassl/sniffer.h \

2
cyassl/internal.h
View File

@ -95,6 +95,8 @@
#else
#include <rtl.h>
#endif
#elif defined(MBED)
#else
#ifndef SINGLE_THREADED
#define CYASSL_PTHREADS

2
mcapi/crypto.c
View File

@ -39,7 +39,7 @@
#include <cyassl/ctaocrypt/aes.h>
#include <cyassl/ctaocrypt/rsa.h>
#include <cyassl/ctaocrypt/ecc.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
/* Initialize MD5 */

4
rpm/spec.in
View File

@ -92,7 +92,7 @@ mkdir -p $RPM_BUILD_ROOT/
%{_includedir}/cyassl/ctaocrypt/dh.h
%{_includedir}/cyassl/ctaocrypt/dsa.h
%{_includedir}/cyassl/ctaocrypt/ecc.h
%{_includedir}/cyassl/ctaocrypt/error.h
%{_includedir}/cyassl/ctaocrypt/error-crypt.h
%{_includedir}/cyassl/ctaocrypt/hc128.h
%{_includedir}/cyassl/ctaocrypt/hmac.h
%{_includedir}/cyassl/ctaocrypt/integer.h
@ -118,7 +118,7 @@ mkdir -p $RPM_BUILD_ROOT/
%{_includedir}/cyassl/ctaocrypt/tfm.h
%{_includedir}/cyassl/ctaocrypt/types.h
%{_includedir}/cyassl/ctaocrypt/visibility.h
%{_includedir}/cyassl/error.h
%{_includedir}/cyassl/error-ssl.h
%{_includedir}/cyassl/ocsp.h
%{_includedir}/cyassl/openssl/asn1.h
%{_includedir}/cyassl/openssl/bio.h

2
src/crl.c
View File

@ -28,7 +28,7 @@
#ifdef HAVE_CRL
#include <cyassl/internal.h>
#include <cyassl/error.h>
#include <cyassl/error-ssl.h>
#include <dirent.h>
#include <sys/stat.h>

2
src/internal.c
View File

@ -27,7 +27,7 @@
#include <cyassl/ctaocrypt/settings.h>
#include <cyassl/internal.h>
#include <cyassl/error.h>
#include <cyassl/error-ssl.h>
#include <cyassl/ctaocrypt/asn.h>
#ifdef HAVE_LIBZ

2
src/io.c
View File

@ -31,7 +31,7 @@
#endif
#include <cyassl/internal.h>
#include <cyassl/error.h>
#include <cyassl/error-ssl.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()

2
src/keys.c
View File

@ -27,7 +27,7 @@
#include <cyassl/ctaocrypt/settings.h>
#include <cyassl/internal.h>
#include <cyassl/error.h>
#include <cyassl/error-ssl.h>
#ifdef SHOW_SECRETS
#ifdef FREESCALE_MQX
#include <fio.h>

2
src/ocsp.c
View File

@ -27,7 +27,7 @@
#ifdef HAVE_OCSP
#include <cyassl/error.h>
#include <cyassl/error-ssl.h>
#include <cyassl/ocsp.h>
#include <cyassl/internal.h>

2
src/sniffer.c
View File

@ -44,7 +44,7 @@
#include <cyassl/openssl/ssl.h>
#include <cyassl/internal.h>
#include <cyassl/error.h>
#include <cyassl/error-ssl.h>
#include <cyassl/sniffer.h>
#include <cyassl/sniffer_error.h>

2
src/ssl.c
View File

@ -32,7 +32,7 @@
#include <cyassl/ssl.h>
#include <cyassl/internal.h>
#include <cyassl/error.h>
#include <cyassl/error-ssl.h>
#include <cyassl/ctaocrypt/coding.h>
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)

2
src/tls.c
View File

@ -27,7 +27,7 @@
#include <cyassl/ssl.h>
#include <cyassl/internal.h>
#include <cyassl/error.h>
#include <cyassl/error-ssl.h>
#include <cyassl/ctaocrypt/hmac.h>