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

Merge pull request #3937 from elms/intime/dir_pre_intimever6

Browse Source 
INTIME: support CRL for INTIME version < 6
This commit is contained in:
David Garske
2021-04-21 10:42:33 -07:00
committed by GitHub
parent 38ff193368 9dd5768ecc
commit 67277d13cd
2 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
wolfcrypt/src/wc_port.c
View File

@@ -508,28 +508,28 @@ int wc_ReadDirFirst(ReadDirCtx* ctx, const char* path, char** name)
XSTRNCPY(ctx->name, path, MAX_FILENAME_SZ - 3);
XSTRNCPY(ctx->name + pathLen, "\\*", MAX_FILENAME_SZ - pathLen);
if (!FindFirstRtFile(ctx->name, &ctx->FindFileData, 0)) {
if (!IntimeFindFirst(ctx->name, &ctx->FindFileData)) {
WOLFSSL_MSG("FindFirstFile for path verify locations failed");
return BAD_PATH_ERROR;
}
do {
if (!(ctx->FindFileData.dwFileAttributes & FILE_ATTR_DIRECTORY)) {
dnameLen = (int)XSTRLEN(ctx->FindFileData.cFileName);
dnameLen = (int)XSTRLEN(IntimeFilename(ctx));
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) {
return BAD_PATH_ERROR;
}
XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '\\';
XSTRNCPY(ctx->name + pathLen + 1,
ctx->FindFileData.cFileName,
MAX_FILENAME_SZ - pathLen - 1);
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) {
return BAD_PATH_ERROR;
}
XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '\\';
XSTRNCPY(ctx->name + pathLen + 1,
IntimeFilename(ctx),
MAX_FILENAME_SZ - pathLen - 1);
if (0 == wc_FileExists(ctx->name)) {
if (name)
*name = ctx->name;
return 0;
}
} while (FindNextRtFile(&ctx->FindFileData));
} while (IntimeFindNext(&ctx->FindFileData));
#elif defined(WOLFSSL_ZEPHYR)
if (fs_opendir(&ctx->dir, path) != 0) {
@@ -656,18 +656,18 @@ int wc_ReadDirNext(ReadDirCtx* ctx, const char* path, char** name)
}
#elif defined(INTIME_RTOS)
while (FindNextRtFile(&ctx->FindFileData)) {
if (!(ctx->FindFileData.dwFileAttributes & FILE_ATTR_DIRECTORY)) {
dnameLen = (int)XSTRLEN(ctx->FindFileData.cFileName);
while (IntimeFindNext(&ctx->FindFileData)) {
dnameLen = (int)XSTRLEN(IntimeFilename(ctx));
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) {
return BAD_PATH_ERROR;
}
XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '\\';
XSTRNCPY(ctx->name + pathLen + 1,
ctx->FindFileData.cFileName,
MAX_FILENAME_SZ - pathLen - 1);
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) {
return BAD_PATH_ERROR;
}
XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '\\';
XSTRNCPY(ctx->name + pathLen + 1,
IntimeFilename(ctx),
MAX_FILENAME_SZ - pathLen - 1);
if (0 == wc_FileExists(ctx->name)) {
if (name)
*name = ctx->name;
return 0;
@@ -758,7 +758,7 @@ void wc_ReadDirClose(ReadDirCtx* ctx)
}
#elif defined(INTIME_RTOS)
FindRtFileClose(&ctx->FindFileData);
IntimeFindClose(&ctx->FindFileData);
#elif defined(WOLFSSL_ZEPHYR)
if (ctx->dirp) {

17
wolfssl/wolfcrypt/wc_port.h
View File

@@ -699,6 +699,16 @@ WOLFSSL_API int wolfCrypt_Cleanup(void);
#define XSTAT _stat
#define XS_ISREG(s) (s & _S_IFREG)
#define SEPARATOR_CHAR ';'
#elif defined(INTIME_RTOS)
#include <sys/stat.h>
#define XSTAT _stat64
#define XS_ISREG(s) S_ISREG(s)
#define SEPARATOR_CHAR ';'
#define XWRITE write
#define XREAD read
#define XCLOSE close
#elif defined(WOLFSSL_ZEPHYR)
#define XSTAT fs_stat
#define XS_ISREG(s) (s == FS_DIR_ENTRY_FILE)
@@ -765,7 +775,12 @@ WOLFSSL_API int wolfCrypt_Cleanup(void);
struct M2MB_DIRENT* entry;
struct M2MB_STAT s;
#elif defined(INTIME_RTOS)
FIND_FILE_DATA FindFileData;
struct stat64 s;
struct _find64 FindFileData;
#define IntimeFindFirst(name, data) (0 == _findfirst64(name, data))
#define IntimeFindNext(data) (0 == _findnext64(data))
#define IntimeFindClose(data) (0 == _findclose64(data))
#define IntimeFilename(ctx) ctx->FindFileData.f_filename
#else
struct dirent* entry;
DIR* dir;