Enhanced "ChangeToWolfRoot" to report error if the root was not found. Also fixed the depth limit.

This commit is contained in:
David Garske
2015-10-29 10:45:37 -07:00
parent f977caa492
commit dacfd84bea

View File

@@ -1172,16 +1172,17 @@ static INLINE int OpenNitroxDevice(int dma_mode,int dev_id)
static INLINE int ChangeToWolfRoot(void)
{
#if !defined(NO_FILESYSTEM)
int depth;
XFILE file;
char path[MAX_PATH];
XMEMSET(path, 0, MAX_PATH);
for(depth = 0; depth < MAX_WOLF_ROOT_DEPTH; depth++) {
file = XFOPEN(ntruCert, "rb");
for(depth = 0; depth <= MAX_WOLF_ROOT_DEPTH; depth++) {
file = XFOPEN(ntruKey, "rb");
if (file != XBADFILE) {
XFCLOSE(file);
break;
return depth;
}
#ifdef USE_WINDOWS_API
XSTRNCAT(path, "..\\", MAX_PATH);
@@ -1194,7 +1195,12 @@ static INLINE int OpenNitroxDevice(int dma_mode,int dev_id)
}
#endif
}
return depth;
err_sys("wolf root not found");
return -1;
#else
return 0;
#endif
}
#endif /* !defined(WOLFSSL_MDK_ARM) && !defined(WOLFSSL_KEIL_FS) && !defined(WOLFSSL_TIRTOS) */