wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 04:34:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

add check on NETX duo build and return value of opening driver

Browse Source
This commit is contained in:
Jacob Barthelmeh
2020-01-20 09:33:14 -07:00
parent c01cd808da
commit 3508579f4c
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/random.c
View File

@@ -2324,7 +2324,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
word32 len = sz; word32 len = sz;
ret = g_sce_trng.p_api->open(g_sce_trng.p_ctrl, g_sce_trng.p_cfg); ret = g_sce_trng.p_api->open(g_sce_trng.p_ctrl, g_sce_trng.p_cfg);
if (ret != SSP_SUCCESS) { if (ret != SSP_SUCCESS && ret != SSP_ERR_CRYPTO_ALREADY_OPEN) {
/* error opening TRNG driver */ /* error opening TRNG driver */
return -1; return -1;
} }

3
wolfcrypt/src/wc_port.c
View File

@@ -229,7 +229,8 @@ int wolfCrypt_Init(void)
#endif #endif
#ifdef WOLFSSL_SCE #ifdef WOLFSSL_SCE
if ((ret = g_sce.p_api->open(g_sce.p_ctrl, g_sce.p_cfg)) != SSP_SUCCESS) { ret = (int)g_sce.p_api->open(g_sce.p_ctrl, g_sce.p_cfg);
if (ret != SSP_SUCCESS && ret != SSP_ERR_CRYPTO_ALREADY_OPEN) {
WOLFSSL_MSG("Error opening SCE\n"); WOLFSSL_MSG("Error opening SCE\n");
return -1; /* FATAL_ERROR */ return -1; /* FATAL_ERROR */
} }

6
wolfssl/wolfio.h
View File

@@ -83,7 +83,11 @@
#elif defined(WOLFSSL_IAR_ARM) #elif defined(WOLFSSL_IAR_ARM)
/* nothing */ /* nothing */
#elif defined(HAVE_NETX_BSD) #elif defined(HAVE_NETX_BSD)
#include "nx_bsd.h" #ifdef NETX_DUO
#include "nxd_bsd.h"
#else
#include "nx_bsd.h"
#endif
#elif defined(WOLFSSL_VXWORKS) #elif defined(WOLFSSL_VXWORKS)
#include <sockLib.h> #include <sockLib.h>
#include <errno.h> #include <errno.h>