wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

XBADFILE in bio.c

Browse Source
This commit is contained in:
Takashi Kojo
2018-07-14 09:43:45 +09:00
committed by Go Hosohara
parent fd634141bd
commit 4d03b55fef
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bio.c
View File

@ -557,7 +557,7 @@ int wolfSSL_BIO_gets(WOLFSSL_BIO* bio, char* buf, int sz)
switch (bio->type) { switch (bio->type) {
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
case WOLFSSL_BIO_FILE: case WOLFSSL_BIO_FILE:
if (bio->file == NULL) { if (bio->file == XBADFILE) {
return WOLFSSL_BIO_ERROR; return WOLFSSL_BIO_ERROR;
} }
@ -1068,8 +1068,7 @@ long wolfSSL_BIO_set_fp(WOLFSSL_BIO *bio, XFILE fp, int c)
{ {
WOLFSSL_ENTER("wolfSSL_BIO_set_fp"); WOLFSSL_ENTER("wolfSSL_BIO_set_fp");
if (bio == NULL || fp == XBADFILE) if (bio == NULL || fp == XBADFILE) {
{
WOLFSSL_LEAVE("wolfSSL_BIO_set_fp", BAD_FUNC_ARG); WOLFSSL_LEAVE("wolfSSL_BIO_set_fp", BAD_FUNC_ARG);
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -1089,7 +1088,7 @@ long wolfSSL_BIO_get_fp(WOLFSSL_BIO *bio, XFILE* fp)
{ {
WOLFSSL_ENTER("wolfSSL_BIO_get_fp"); WOLFSSL_ENTER("wolfSSL_BIO_get_fp");
if (bio == NULL || fp == NULL) { if (bio == NULL || fp == XBADFILE) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -1112,7 +1111,7 @@ int wolfSSL_BIO_write_filename(WOLFSSL_BIO *bio, char *name)
} }
if (bio->type == WOLFSSL_BIO_FILE) { if (bio->type == WOLFSSL_BIO_FILE) {
if (bio->file != NULL && bio->close == BIO_CLOSE) { if (bio->file != XBADFILE && bio->close == BIO_CLOSE) {
XFCLOSE(bio->file); XFCLOSE(bio->file);
} }

6
tests/api.c
View File

@ -14669,7 +14669,7 @@ static void test_wc_PKCS7_InitWithCert (void)
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp); certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
XCLOSE(fp); XFCLOSE(fp);
#endif #endif
#else #else
#error PKCS7 requires ECC or RSA #error PKCS7 requires ECC or RSA
@ -14739,7 +14739,7 @@ static void test_wc_PKCS7_EncodeData (void)
certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp); certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
fp = XOPEN("./certs/1024/client-key.der", "rb"); fp = XFOPEN("./certs/1024/client-key.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
keySz = XFREAD(key, 1, sizeof_client_key_der_1024, fp); keySz = XFREAD(key, 1, sizeof_client_key_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
@ -14840,7 +14840,7 @@ static void test_wc_PKCS7_EncodeSignedData(void)
int certSz; int certSz;
int keySz; int keySz;
fp = XOPEN("./certs/1024/client-cert.der", "rb"); fp = XFOPEN("./certs/1024/client-cert.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp); certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);