Merge pull request #7138 from ejohnstown/crl-mon-test-fix

CRL Monitor Test Fix
This commit is contained in:
David Garske
2024-01-18 08:20:05 -08:00
committed by GitHub
3 changed files with 16 additions and 2 deletions

View File

@ -111,6 +111,13 @@ cleanup:
XFCLOSE(outFile); XFCLOSE(outFile);
return ret; return ret;
} }
#if defined(__MACH__) || defined(__FreeBSD__)
int link_file(const char* in, const char* out)
{
return link(in, out);
}
#endif
#endif /* !NO_FILESYSTEM */ #endif /* !NO_FILESYSTEM */
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \ #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \

View File

@ -327,7 +327,7 @@ static int test_crl_monitor(void)
if (i % 2 == 0) { if (i % 2 == 0) {
/* succeed on even rounds */ /* succeed on even rounds */
sprintf(buf, "%s/%s", tmpDir, "crl.pem"); sprintf(buf, "%s/%s", tmpDir, "crl.pem");
if (copy_file("certs/crl/crl.pem", buf) != 0) { if (STAGE_FILE("certs/crl/crl.pem", buf) != 0) {
fprintf(stderr, "[%d] Failed to copy file to %s\n", i, buf); fprintf(stderr, "[%d] Failed to copy file to %s\n", i, buf);
goto cleanup; goto cleanup;
} }
@ -350,7 +350,7 @@ static int test_crl_monitor(void)
else { else {
/* fail on odd rounds */ /* fail on odd rounds */
sprintf(buf, "%s/%s", tmpDir, "crl.revoked"); sprintf(buf, "%s/%s", tmpDir, "crl.revoked");
if (copy_file("certs/crl/crl.revoked", buf) != 0) { if (STAGE_FILE("certs/crl/crl.revoked", buf) != 0) {
fprintf(stderr, "[%d] Failed to copy file to %s\n", i, buf); fprintf(stderr, "[%d] Failed to copy file to %s\n", i, buf);
goto cleanup; goto cleanup;
} }

View File

@ -656,6 +656,13 @@ int rem_dir(const char* dirName);
int rem_file(const char* fileName); int rem_file(const char* fileName);
int copy_file(const char* in, const char* out); int copy_file(const char* in, const char* out);
#if defined(__MACH__) || defined(__FreeBSD__)
int link_file(const char* in, const char* out);
#define STAGE_FILE(x,y) link_file((x),(y))
#else
#define STAGE_FILE(x,y) copy_file((x),(y))
#endif
void signal_ready(tcp_ready* ready); void signal_ready(tcp_ready* ready);
/* wolfSSL */ /* wolfSSL */