Final cleanups. Will rebase.

Author: billphipps

src/wh_flash_ramsim.c

@@ -99,7 +99,7 @@ int whFlashRamsim_Cleanup(void* context)
 
     return WH_ERROR_OK;
 }
-#include <stdio.h>
+
 int whFlashRamsim_Program(void* context, uint32_t offset, uint32_t size,
                           const uint8_t* data)
 {

src/wh_server_crypto.c

@@ -453,11 +453,9 @@ int wh_Server_CacheImportCurve25519Key(whServerContext* server,
     whNvmMetadata* cacheMeta;
     int            ret;
 
-#ifndef CURVE25519_MAX_KEY_TO_DER_SZ
-#define CURVE25519_MAX_KEY_TO_DER_SZ 128
-#endif
-    uint8_t der_buf[CURVE25519_MAX_KEY_TO_DER_SZ];
-    uint16_t       keySz        = sizeof(der_buf);
+    /* CURVE2219_MAX_KEY_TO_DER_SZ should be 82 */
+    uint8_t        der_buf[CURVE25519_MAX_KEY_TO_DER_SZ];
+    uint16_t       keySz = sizeof(der_buf);
 
 
     if ((server == NULL) || (key == NULL) || (WH_KEYID_ISERASED(keyId)) ||

test/wh_test.c

@@ -64,10 +64,6 @@ int whTest_Unit(void)
     WH_TEST_ASSERT(0 == whTest_Comm());
     WH_TEST_ASSERT(0 == whTest_ClientServer());
 
-    /* TEMP Force flush out put streams */
-    fflush(NULL);
-    /* TEMP End */
-
 #ifndef WOLFHSM_CFG_NO_CRYPTO
     /* Crypto Tests */
     WH_TEST_ASSERT(0 == whTest_Crypto());

test/wh_test_crypto.c

@@ -2199,7 +2199,6 @@ int whTest_CryptoClientConfig(whClientConfig* config)
     }
 
     WH_TEST_RETURN_ON_FAIL(wh_Client_Init(client, config));
-    printf("%s:%u Ret:%d\n", __func__, __LINE__, ret);
 
     ret = wh_Client_CommInit(client, NULL, NULL);
     if (ret != 0) {
@@ -2226,7 +2225,6 @@ int whTest_CryptoClientConfig(whClientConfig* config)
         ret = whTestCrypto_Aes(client, WH_DEV_ID, rng);
     }
 #endif /* !NO_AES */
-    printf("%s:%u Ret:%d\n", __func__, __LINE__, ret);
 
 #if defined(WOLFSSL_CMAC) && !defined(NO_AES) && defined(WOLFSSL_AES_DIRECT)
     i = 0;
@@ -2249,7 +2247,6 @@ int whTest_CryptoClientConfig(whClientConfig* config)
         ret = whTest_CryptoEcc(client, WH_DEV_ID, rng);
     }
 #endif /* HAVE_ECC */
-    printf("%s:%u Ret:%d\n", __func__, __LINE__, ret);
 
 #ifdef HAVE_CURVE25519
     /* test curve25519 */
@@ -2288,7 +2285,6 @@ int whTest_CryptoClientConfig(whClientConfig* config)
             i++;
         }
     }
-    printf("%s:%u Ret:%d\n", __func__, __LINE__, ret);
 
 #ifdef WOLFHSM_CFG_DMA
     if (ret == 0) {
@@ -2323,8 +2319,6 @@ int whTest_CryptoClientConfig(whClientConfig* config)
     (void)wh_Client_CommClose(client);
     (void)wh_Client_Cleanup(client);
 
-    printf("%s:%u Final Ret:%d\n", __func__, __LINE__, ret);
-    fflush(NULL);
     return ret;
 }
 #ifndef NO_WOLFHSM_CFG_TEST_CRYPTSVR_CFG

wolfhsm/wh_error.h

@@ -40,31 +40,29 @@ enum WH_ERROR_ENUM {
     WH_ERROR_CERT_VERIFY    = -2005, /* Certificate verification failed */
     WH_ERROR_BUFFER_SIZE    = -2006, /* Generic buffer size mismatch. Buffer
                                       * length is not what was expected */
+    WH_ERROR_NOHANDLER      = -2007, /* No customcb handler registered */
 
     /* NVM-specific status returns */
-    WH_ERROR_LOCKED         = -2010, /* Unlock and retry if necessary */
-    WH_ERROR_ACCESS         = -2011, /* Update access and retry */
-    WH_ERROR_NOTVERIFIED    = -2012, /* Backing store does not match */
-    WH_ERROR_NOTBLANK       = -2013, /* Area is no blank */
-    WH_ERROR_NOTFOUND       = -2014, /* Matching object not found */
-    WH_ERROR_NOSPACE        = -2015, /* No available space */
-
-    /* Custom-callback status returns */
-    WH_ERROR_NOHANDLER      = -2020, /* No handler registered for action */
+    WH_ERROR_LOCKED         = -2100, /* Unlock and retry if necessary */
+    WH_ERROR_ACCESS         = -2101, /* Update access and retry */
+    WH_ERROR_NOTVERIFIED    = -2102, /* Backing store does not match */
+    WH_ERROR_NOTBLANK       = -2103, /* Area is no blank */
+    WH_ERROR_NOTFOUND       = -2104, /* Matching object not found */
+    WH_ERROR_NOSPACE        = -2105, /* No available space */
 
     /* SHE-specific error codes */
-    WH_SHE_ERC_SEQUENCE_ERROR       = -2100,
-    WH_SHE_ERC_KEY_NOT_AVAILABLE    = -2101,
-    WH_SHE_ERC_KEY_INVALID          = -2102,
-    WH_SHE_ERC_KEY_EMPTY            = -2103,
-    WH_SHE_ERC_NO_SECURE_BOOT       = -2104,
-    WH_SHE_ERC_WRITE_PROTECTED      = -2105,
-    WH_SHE_ERC_KEY_UPDATE_ERROR     = -2106,
-    WH_SHE_ERC_RNG_SEED             = -2107,
-    WH_SHE_ERC_NO_DEBUGGING         = -2108,
-    WH_SHE_ERC_BUSY                 = -2109,
-    WH_SHE_ERC_MEMORY_FAILURE       = -2110,
-    WH_SHE_ERC_GENERAL_ERROR        = -2111,
+    WH_SHE_ERC_SEQUENCE_ERROR       = -2200,
+    WH_SHE_ERC_KEY_NOT_AVAILABLE    = -2201,
+    WH_SHE_ERC_KEY_INVALID          = -2202,
+    WH_SHE_ERC_KEY_EMPTY            = -2203,
+    WH_SHE_ERC_NO_SECURE_BOOT       = -2204,
+    WH_SHE_ERC_WRITE_PROTECTED      = -2205,
+    WH_SHE_ERC_KEY_UPDATE_ERROR     = -2206,
+    WH_SHE_ERC_RNG_SEED             = -2207,
+    WH_SHE_ERC_NO_DEBUGGING         = -2208,
+    WH_SHE_ERC_BUSY                 = -2209,
+    WH_SHE_ERC_MEMORY_FAILURE       = -2210,
+    WH_SHE_ERC_GENERAL_ERROR        = -2211,
 };
 
 #define WH_SHE_ERC_NO_ERROR WH_ERROR_OK