resolve pull request merge conflict

2014-03-25 11:39:07 -07:00
parent 8c5d958a8b
commit fb6d671629
38 changed files with 55 additions and 40 deletions
--- a/ctaocrypt/src/aes.c
+++ b/ctaocrypt/src/aes.c
@@ -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 */

+
--- a/ctaocrypt/src/asn.c
+++ b/ctaocrypt/src/asn.c
@@ -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>
--- a/ctaocrypt/src/camellia.c
+++ b/ctaocrypt/src/camellia.c
@@ -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>
--- a/ctaocrypt/src/coding.c
+++ b/ctaocrypt/src/coding.c
@@ -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>


--- a/ctaocrypt/src/compress.c
+++ b/ctaocrypt/src/compress.c
@@ -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>
--- a/ctaocrypt/src/dh.c
+++ b/ctaocrypt/src/dh.c
@@ -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>
--- a/ctaocrypt/src/dsa.c
+++ b/ctaocrypt/src/dsa.c
@@ -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 {
--- a/ctaocrypt/src/ecc.c
+++ b/ctaocrypt/src/ecc.c
@@ -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>
--- a/ctaocrypt/src/error.c
+++ b/ctaocrypt/src/error.c
@@ -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 */
--- a/ctaocrypt/src/hc128.c
+++ b/ctaocrypt/src/hc128.c
@@ -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>
--- a/ctaocrypt/src/hmac.c
+++ b/ctaocrypt/src/hmac.c
@@ -44,7 +44,7 @@
 #endif

 #include <cyassl/ctaocrypt/hmac.h>
-#include <cyassl/ctaocrypt/error.h>
+#include <cyassl/ctaocrypt/error-crypt.h>


 #ifdef HAVE_CAVIUM
--- a/ctaocrypt/src/logging.c
+++ b/ctaocrypt/src/logging.c
@@ -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
--- a/ctaocrypt/src/memory.c
+++ b/ctaocrypt/src/memory.c
@@ -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>
--- a/ctaocrypt/src/pkcs7.c
+++ b/ctaocrypt/src/pkcs7.c
@@ -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
--- a/ctaocrypt/src/port.c
+++ b/ctaocrypt/src/port.c
@@ -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"
--- a/ctaocrypt/src/pwdbased.c
+++ b/ctaocrypt/src/pwdbased.c
@@ -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
--- a/ctaocrypt/src/rabbit.c
+++ b/ctaocrypt/src/rabbit.c
@@ -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>
--- a/ctaocrypt/src/random.c
+++ b/ctaocrypt/src/random.c
@@ -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>
--- a/ctaocrypt/src/rsa.c
+++ b/ctaocrypt/src/rsa.c
@@ -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