resolve pull request merge conflict

cyassl/ctaocrypt/error-crypt.h

@@ -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 */
 
+

cyassl/ctaocrypt/include.am

@@ -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 \

cyassl/ctaocrypt/port.h

@@ -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 */

cyassl/ctaocrypt/settings.h

@@ -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"