From ddcf11011e678abf38252063253422afd1e4fb77 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Tue, 2 May 2017 10:20:31 -0700
Subject: [PATCH] Added return code checking for `wolfCrypt_Init()`. Added
 `initRefCount` check on `wolfCrypt_Cleanup()`. Fix link for tenAsys INtime
 RTOS readme.

---
 IDE/INTIME-RTOS/README.md |  2 +-
 wolfcrypt/src/wc_port.c   | 66 +++++++++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/IDE/INTIME-RTOS/README.md b/IDE/INTIME-RTOS/README.md
index e864f7db1..9d5d7bdfc 100755
--- a/IDE/INTIME-RTOS/README.md
+++ b/IDE/INTIME-RTOS/README.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-This port is for the tenAsys INtime RTOS available [here](http://www.tenasys.com/tenasys-products/intime-rtos-family/overview-rtos).
+This port is for the tenAsys INtime RTOS available [here](http://www.tenasys.com/intime).
 
 To enable use the define `INTIME_RTOS`.
 
diff --git a/wolfcrypt/src/wc_port.c b/wolfcrypt/src/wc_port.c
index 388c71c28..5478b9692 100755
--- a/wolfcrypt/src/wc_port.c
+++ b/wolfcrypt/src/wc_port.c
@@ -74,17 +74,31 @@ int wolfCrypt_Init(void)
     int ret = 0;
 
     if (initRefCount == 0) {
+        WOLFSSL_ENTER("wolfCrypt_Init");
+
     #ifdef WOLFSSL_ASYNC_CRYPT
-        wolfAsync_HardwareStart();
+        ret = wolfAsync_HardwareStart();
+        if (ret != 0) {
+            WOLFSSL_MSG("Async hardware start failed");
+            return ret;
+        }
     #endif
 
     #if defined(WOLFSSL_TRACK_MEMORY) && !defined(WOLFSSL_STATIC_MEMORY)
-        InitMemoryTracker();
+        ret = InitMemoryTracker();
+        if (ret != 0) {
+            WOLFSSL_MSG("InitMemoryTracker failed");
+            return ret;
+        }
     #endif
 
     #if WOLFSSL_CRYPT_HW_MUTEX
         /* If crypto hardware mutex protection is enabled, then initialize it */
-        wolfSSL_CryptHwMutexInit();
+        ret = wolfSSL_CryptHwMutexInit();
+        if (ret != 0) {
+            WOLFSSL_MSG("Hw crypt mutex init failed");
+            return ret;
+        }
     #endif
 
     /* if defined have fast RSA then initialize Intel IPP */
@@ -102,7 +116,11 @@ int wolfCrypt_Init(void)
     #endif
 
     #if defined(FREESCALE_LTC_TFM) || defined(FREESCALE_LTC_ECC)
-        ksdk_port_init();
+        ret = ksdk_port_init();
+        if (ret != 0) {
+            WOLFSSL_MSG("KSDK port init failed");
+            return ret;
+        }
     #endif
 
     #ifdef WOLFSSL_ATMEL
@@ -124,14 +142,14 @@ int wolfCrypt_Init(void)
         }
     #endif
 
-    #ifdef HAVE_ECC
-        #ifdef ECC_CACHE_CURVE
-            if ((ret = wc_ecc_curve_cache_init()) != 0) {
-                WOLFSSL_MSG("Error creating curve cache");
-                return ret;
-            }
-        #endif
+#ifdef HAVE_ECC
+    #ifdef ECC_CACHE_CURVE
+        if ((ret = wc_ecc_curve_cache_init()) != 0) {
+            WOLFSSL_MSG("Error creating curve cache");
+            return ret;
+        }
     #endif
+#endif
 
         initRefCount = 1;
     }
@@ -145,7 +163,8 @@ int wolfCrypt_Cleanup(void)
 {
     int ret = 0;
 
-    WOLFSSL_ENTER("wolfCrypt_Cleanup");
+    if (initRefCount == 1) {
+        WOLFSSL_ENTER("wolfCrypt_Cleanup");
 
 #ifdef HAVE_ECC
     #ifdef FP_ECC
@@ -154,21 +173,22 @@ int wolfCrypt_Cleanup(void)
     #ifdef ECC_CACHE_CURVE
         wc_ecc_curve_cache_free();
     #endif
-#endif
+#endif /* HAVE_ECC */
 
-#if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE)
-    ret = wc_LoggingCleanup();
-#endif
+    #if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE)
+        ret = wc_LoggingCleanup();
+    #endif
 
-#if defined(WOLFSSL_TRACK_MEMORY) && !defined(WOLFSSL_STATIC_MEMORY)
-    ShowMemoryTracker();
-#endif
+    #if defined(WOLFSSL_TRACK_MEMORY) && !defined(WOLFSSL_STATIC_MEMORY)
+        ShowMemoryTracker();
+    #endif
 
-#ifdef WOLFSSL_ASYNC_CRYPT
-    wolfAsync_HardwareStop();
-#endif
+    #ifdef WOLFSSL_ASYNC_CRYPT
+        wolfAsync_HardwareStop();
+    #endif
 
-    initRefCount = 0; /* allow re-init */
+        initRefCount = 0; /* allow re-init */
+    }
 
     return ret;
 }