From b430a14032553401bc48439971ef14c8d8077346 Mon Sep 17 00:00:00 2001
From: takashikojo <takashi.kojo@gmail.com>
Date: Sun, 19 May 2013 10:33:32 +0900
Subject: [PATCH] make up for MDK-ARM release

---
 IDE/MDK-ARM/MDK-ARM/CyaSSL/cyassl_MDK_ARM.h |  3 ---
 IDE/MDK-ARM/MDK-ARM/CyaSSL/ssl-dummy.c      |  7 +++++-
 cyassl/test.h                               |  1 -
 examples/client/client.c                    |  2 +-
 examples/echoclient/echoclient.c            |  2 +-
 examples/echoserver/echoserver.c            |  2 +-
 src/internal.c                              | 24 +++++++++++++++++++++
 src/io.c                                    |  8 +++++++
 src/ssl.c                                   |  4 +++-
 9 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/IDE/MDK-ARM/MDK-ARM/CyaSSL/cyassl_MDK_ARM.h b/IDE/MDK-ARM/MDK-ARM/CyaSSL/cyassl_MDK_ARM.h
index 3deb41867..c565b6e15 100644
--- a/IDE/MDK-ARM/MDK-ARM/CyaSSL/cyassl_MDK_ARM.h
+++ b/IDE/MDK-ARM/MDK-ARM/CyaSSL/cyassl_MDK_ARM.h
@@ -84,9 +84,6 @@ extern int Cyassl_accept(int sd, struct sockaddr *addr, socklen_t *addrlen);
 extern int Cyassl_recv(int sd, void *buf, size_t len, int flags);
 extern int Cyassl_send(int sd, const void *buf, size_t len, int flags);
 extern void Cyassl_sleep(int sec) ;
-extern int Cyassl_tcp_socket(SOCKET_T* sockfd, int udp) ;
-extern void Cyassl_tcp_listen(SOCKET_T* sockfd, int port,
-                                       int useAnyAddr, int udp) ;
 extern int Cyassl_tcp_select(int sd, int timeout) ;
 
 /** KEIL-RL TCPnet ****/
diff --git a/IDE/MDK-ARM/MDK-ARM/CyaSSL/ssl-dummy.c b/IDE/MDK-ARM/MDK-ARM/CyaSSL/ssl-dummy.c
index e750400f7..024d10373 100644
--- a/IDE/MDK-ARM/MDK-ARM/CyaSSL/ssl-dummy.c
+++ b/IDE/MDK-ARM/MDK-ARM/CyaSSL/ssl-dummy.c
@@ -45,4 +45,9 @@ int CyaSSL_get_using_nonblock(CYASSL* ssl)
     CYASSL_LEAVE("CyaSSL_get_using_nonblock", ssl->options.usingNonblock);
     return ssl->options.usingNonblock;
 }
-
+
+Signer* GetCAByName(void* vp, byte* hash)
+{
+		Signer * ca ;
+    return(ca) ;
+}
diff --git a/cyassl/test.h b/cyassl/test.h
index 97bd6e89d..641826a0e 100644
--- a/cyassl/test.h
+++ b/cyassl/test.h
@@ -21,7 +21,6 @@
     #define SNPRINTF _snprintf
 #elif defined(CYASSL_MDK_ARM)
     #include <string.h>
-    #define SOCKET_T unsigned int
 #else
     #include <string.h>
     #include <sys/types.h>
diff --git a/examples/client/client.c b/examples/client/client.c
index dc6f6fd70..e0479d839 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -133,7 +133,7 @@ static void Usage(void)
 }
 
 #ifdef CYASSL_MDK_SHELL
-#define exit(code) return
+#define exit(code) return(code)
 #endif
 
 THREAD_RETURN CYASSL_THREAD client_test(void* args)
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index 1b6c05c67..0c444a2a2 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -93,7 +93,7 @@ void echoclient_test(void* args)
     doPSK = 1;
 #endif
 
-#if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API)
+#if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && !defined(CYASSL_MDK_SHELL)
     port = ((func_args*)args)->signal->port;
 #endif
 
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index b35c4bee3..cc4ed7200 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -107,7 +107,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
 #endif
 
     #if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && \
-                                   !defined(CYASSL_SNIFFER)
+                      !defined(CYASSL_SNIFFER) && !defined(CYASSL_MDK_SHELL)
         port = 0;
     #endif
     #if defined(USE_ANY_ADDR)
diff --git a/src/internal.c b/src/internal.c
index 07defa7c1..b7dc206cd 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -10189,6 +10189,30 @@ int UnLockMutex(CyaSSL_Mutex *m)
             else
                 return BAD_MUTEX_ERROR;
         }
+        
+    #elif defined(CYASSL_MDK_ARM)
 
+        int InitMutex(CyaSSL_Mutex* m)
+        {
+            os_mut_init (m); 
+            return 0;
+        }
+
+        int FreeMutex(CyaSSL_Mutex* m)
+        {
+            return(0) ;
+        }
+
+        int LockMutex(CyaSSL_Mutex* m)
+        {
+            os_mut_wait (m, 0xffff);
+            return(0) ;
+        }
+
+        int UnLockMutex(CyaSSL_Mutex* m)
+        {
+            os_mut_release (m);
+            return 0;
+        }
     #endif /* USE_WINDOWS_API */
 #endif /* SINGLE_THREADED */
diff --git a/src/io.c b/src/io.c
index 1324466c8..d16e96f3c 100644
--- a/src/io.c
+++ b/src/io.c
@@ -55,6 +55,14 @@
     #elif defined(FREESCALE_MQX)
         #include <posix.h>
         #include <rtcs.h>
+    #elif defined(CYASSL_MDK_ARM)
+        #include <rtl.h>
+        #undef RNG
+        #include "CYASSL_MDK_ARM.h"
+        #undef RNG
+        #define RNG CyaSSL_RNG 
+        /* for avoiding name conflict in "stm32f2xx.h" */
+        static int errno ;
     #else
         #include <sys/types.h>
         #include <errno.h>
diff --git a/src/ssl.c b/src/ssl.c
index d208c7be8..bec7080eb 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -5315,7 +5315,9 @@ int CyaSSL_set_compression(CYASSL* ssl)
     }
 
 
-#ifdef USE_WINDOWS_API 
+#ifdef USE_WINDOWS_API
+    #define CloseSocket(s) closesocket(s)
+#elif defined(CYASSL_MDK_ARM)
     #define CloseSocket(s) closesocket(s)
 #else
     #define CloseSocket(s) close(s)