feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

use XFILE, BADFILE, XFxxxx

Browse Source
This commit is contained in:
Takashi Kojo
2018-07-04 06:52:22 +09:00
committed by Go Hosohara
parent 787fa5d49a
commit e6612b34f7
10 changed files with 236 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bio.c
View File

@@ -1068,7 +1068,8 @@ 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 == NULL) { 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;
} }

43
src/ssl.c
View File

@@ -17562,7 +17562,7 @@ int wolfSSL_X509_LOOKUP_load_file(WOLFSSL_X509_LOOKUP* lookup,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
fp = XFOPEN(file, "r"); fp = XFOPEN(file, "r");
if (fp == NULL) if (fp == XBADFILE)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if(XFSEEK(fp, 0, XSEEK_END) != 0) if(XFSEEK(fp, 0, XSEEK_END) != 0)
@@ -20259,7 +20259,7 @@ WOLFSSL_API int wolfSSL_sk_SSL_CIPHER_num(const void * p)
#if !defined(NO_FILESYSTEM) #if !defined(NO_FILESYSTEM)
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB
/*** TBD ***/ /*** TBD ***/
WOLFSSL_API WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PrivateKey(FILE *fp, WOLFSSL_EVP_PKEY **x, pem_password_cb *cb, void *u) WOLFSSL_API WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PrivateKey(XFILE fp, WOLFSSL_EVP_PKEY **x, pem_password_cb *cb, void *u)
{ {
(void)fp; (void)fp;
(void)x; (void)x;
@@ -21804,7 +21804,7 @@ int wolfSSL_RAND_write_file(const char* fname)
XFILE f; XFILE f;
f = XFOPEN(fname, "wb"); f = XFOPEN(fname, "wb");
if (f == NULL) { if (f == XBADFILE) {
WOLFSSL_MSG("Error opening the file"); WOLFSSL_MSG("Error opening the file");
bytes = 0; bytes = 0;
} }
@@ -23040,7 +23040,7 @@ int wolfSSL_BN_print_fp(XFILE fp, const WOLFSSL_BIGNUM *bn)
WOLFSSL_ENTER("wolfSSL_BN_print_fp"); WOLFSSL_ENTER("wolfSSL_BN_print_fp");
if (fp == NULL || bn == NULL || bn->internal == NULL) { if (fp == XBADFILE || bn == NULL || bn->internal == NULL) {
WOLFSSL_MSG("bn NULL error"); WOLFSSL_MSG("bn NULL error");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@@ -26193,7 +26193,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
/* return code compliant with OpenSSL : /* return code compliant with OpenSSL :
* 1 if success, 0 if error * 1 if success, 0 if error
*/ */
int wolfSSL_PEM_write_RSAPrivateKey(FILE *fp, WOLFSSL_RSA *rsa, int wolfSSL_PEM_write_RSAPrivateKey(XFILE fp, WOLFSSL_RSA *rsa,
const EVP_CIPHER *enc, const EVP_CIPHER *enc,
unsigned char *kstr, int klen, unsigned char *kstr, int klen,
pem_password_cb *cb, void *u) pem_password_cb *cb, void *u)
@@ -26206,7 +26206,8 @@ int wolfSSL_PEM_write_RSAPrivateKey(FILE *fp, WOLFSSL_RSA *rsa,
WOLFSSL_MSG("wolfSSL_PEM_write_RSAPrivateKey"); WOLFSSL_MSG("wolfSSL_PEM_write_RSAPrivateKey");
if (fp == NULL || rsa == NULL || rsa->internal == NULL) { if (fp == XBADFILE || rsa == NULL || rsa->internal == NULL)
{
WOLFSSL_MSG("Bad function arguments"); WOLFSSL_MSG("Bad function arguments");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@@ -27590,7 +27591,7 @@ int wolfSSL_ECDH_compute_key(void *out, size_t outlen,
* 1 if success, 0 if error * 1 if success, 0 if error
*/ */
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB
int wolfSSL_PEM_write_EC_PUBKEY(FILE *fp, WOLFSSL_EC_KEY *x) int wolfSSL_PEM_write_EC_PUBKEY(XFILE fp, WOLFSSL_EC_KEY *x)
{ {
(void)fp; (void)fp;
(void)x; (void)x;
@@ -27756,7 +27757,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc,
/* return code compliant with OpenSSL : /* return code compliant with OpenSSL :
* 1 if success, 0 if error * 1 if success, 0 if error
*/ */
int wolfSSL_PEM_write_ECPrivateKey(FILE *fp, WOLFSSL_EC_KEY *ecc, int wolfSSL_PEM_write_ECPrivateKey(XFILE fp, WOLFSSL_EC_KEY *ecc,
const EVP_CIPHER *enc, const EVP_CIPHER *enc,
unsigned char *kstr, int klen, unsigned char *kstr, int klen,
pem_password_cb *cb, void *u) pem_password_cb *cb, void *u)
@@ -27769,7 +27770,7 @@ int wolfSSL_PEM_write_ECPrivateKey(FILE *fp, WOLFSSL_EC_KEY *ecc,
WOLFSSL_MSG("wolfSSL_PEM_write_ECPrivateKey"); WOLFSSL_MSG("wolfSSL_PEM_write_ECPrivateKey");
if (fp == NULL || ecc == NULL || ecc->internal == NULL) { if (fp == XBADFILE || ecc == NULL || ecc->internal == NULL) {
WOLFSSL_MSG("Bad function arguments"); WOLFSSL_MSG("Bad function arguments");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@@ -27949,7 +27950,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa,
/* return code compliant with OpenSSL : /* return code compliant with OpenSSL :
* 1 if success, 0 if error * 1 if success, 0 if error
*/ */
int wolfSSL_PEM_write_DSAPrivateKey(FILE *fp, WOLFSSL_DSA *dsa, int wolfSSL_PEM_write_DSAPrivateKey(XFILE fp, WOLFSSL_DSA *dsa,
const EVP_CIPHER *enc, const EVP_CIPHER *enc,
unsigned char *kstr, int klen, unsigned char *kstr, int klen,
pem_password_cb *cb, void *u) pem_password_cb *cb, void *u)
@@ -27962,7 +27963,7 @@ int wolfSSL_PEM_write_DSAPrivateKey(FILE *fp, WOLFSSL_DSA *dsa,
WOLFSSL_MSG("wolfSSL_PEM_write_DSAPrivateKey"); WOLFSSL_MSG("wolfSSL_PEM_write_DSAPrivateKey");
if (fp == NULL || dsa == NULL || dsa->internal == NULL) { if (fp == XBADFILE || dsa == NULL || dsa->internal == NULL) {
WOLFSSL_MSG("Bad function arguments"); WOLFSSL_MSG("Bad function arguments");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@@ -27991,7 +27992,7 @@ int wolfSSL_PEM_write_DSAPrivateKey(FILE *fp, WOLFSSL_DSA *dsa,
* 1 if success, 0 if error * 1 if success, 0 if error
*/ */
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB
int wolfSSL_PEM_write_DSA_PUBKEY(FILE *fp, WOLFSSL_DSA *x) int wolfSSL_PEM_write_DSA_PUBKEY(XFILE fp, WOLFSSL_DSA *x)
{ {
(void)fp; (void)fp;
(void)x; (void)x;
@@ -28275,7 +28276,7 @@ int wolfSSL_EVP_PKEY_base_id(const EVP_PKEY *pkey)
#if !defined(NO_FILESYSTEM) #if !defined(NO_FILESYSTEM)
WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PUBKEY(FILE *fp, EVP_PKEY **x, WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PUBKEY(XFILE fp, EVP_PKEY **x,
pem_password_cb *cb, void *u) pem_password_cb *cb, void *u)
{ {
(void)fp; (void)fp;
@@ -28293,7 +28294,7 @@ WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PUBKEY(FILE *fp, EVP_PKEY **x,
#if !defined(NO_FILESYSTEM) #if !defined(NO_FILESYSTEM)
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB
WOLFSSL_RSA *wolfSSL_PEM_read_RSAPublicKey(FILE *fp, WOLFSSL_RSA **x, WOLFSSL_RSA *wolfSSL_PEM_read_RSAPublicKey(XFILE fp, WOLFSSL_RSA **x,
pem_password_cb *cb, void *u) pem_password_cb *cb, void *u)
{ {
(void)fp; (void)fp;
@@ -28310,7 +28311,7 @@ WOLFSSL_RSA *wolfSSL_PEM_read_RSAPublicKey(FILE *fp, WOLFSSL_RSA **x,
* 1 if success, 0 if error * 1 if success, 0 if error
*/ */
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB
int wolfSSL_PEM_write_RSAPublicKey(FILE *fp, WOLFSSL_RSA *x) int wolfSSL_PEM_write_RSAPublicKey(XFILE fp, WOLFSSL_RSA *x)
{ {
(void)fp; (void)fp;
(void)x; (void)x;
@@ -28325,7 +28326,7 @@ int wolfSSL_PEM_write_RSAPublicKey(FILE *fp, WOLFSSL_RSA *x)
* 1 if success, 0 if error * 1 if success, 0 if error
*/ */
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB
int wolfSSL_PEM_write_RSA_PUBKEY(FILE *fp, WOLFSSL_RSA *x) int wolfSSL_PEM_write_RSA_PUBKEY(XFILE fp, WOLFSSL_RSA *x)
{ {
(void)fp; (void)fp;
(void)x; (void)x;
@@ -29536,7 +29537,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
WOLFSSL_ENTER("wolfSSL_PEM_read_X509"); WOLFSSL_ENTER("wolfSSL_PEM_read_X509");
if (fp == NULL) { if (fp == XBADFILE) {
WOLFSSL_LEAVE("wolfSSL_PEM_read_X509", BAD_FUNC_ARG); WOLFSSL_LEAVE("wolfSSL_PEM_read_X509", BAD_FUNC_ARG);
return NULL; return NULL;
} }
@@ -30510,13 +30511,13 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
WOLFSSL_ENTER("wolfSSL_BIO_new_file"); WOLFSSL_ENTER("wolfSSL_BIO_new_file");
if ((wolfSSL_BIO_get_fp(b, &fp) == WOLFSSL_SUCCESS) && (fp != NULL)) if ((wolfSSL_BIO_get_fp(b, &fp) == WOLFSSL_SUCCESS) && (fp != XBADFILE))
{ {
XFCLOSE(fp); XFCLOSE(fp);
} }
fp = XFOPEN(name, "r"); fp = XFOPEN(name, "r");
if (fp == NULL) if (fp == XBADFILE)
return WOLFSSL_BAD_FILE; return WOLFSSL_BAD_FILE;
if (wolfSSL_BIO_set_fp(b, fp, BIO_CLOSE) != WOLFSSL_SUCCESS) { if (wolfSSL_BIO_set_fp(b, fp, BIO_CLOSE) != WOLFSSL_SUCCESS) {
@@ -31414,7 +31415,7 @@ WOLFSSL_BIO *wolfSSL_BIO_new_file(const char *filename, const char *mode)
WOLFSSL_ENTER("wolfSSL_BIO_new_file"); WOLFSSL_ENTER("wolfSSL_BIO_new_file");
fp = XFOPEN(filename, mode); fp = XFOPEN(filename, mode);
if (fp == NULL) if (fp == XBADFILE)
return NULL; return NULL;
bio = wolfSSL_BIO_new(wolfSSL_BIO_s_file()); bio = wolfSSL_BIO_new(wolfSSL_BIO_s_file());
@@ -32163,7 +32164,7 @@ void wolfSSL_ERR_remove_thread_state(void* pid)
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
/***TBD ***/ /***TBD ***/
void wolfSSL_print_all_errors_fp(XFILE *fp) void wolfSSL_print_all_errors_fp(XFILE fp)
{ {
(void)fp; (void)fp;
} }

9
swig/wolfssl_adds.c
View File

@@ -207,15 +207,16 @@ RsaKey* GetRsaPrivateKey(const char* keyFile)
size_t bytes; size_t bytes;
int ret; int ret;
word32 idx = 0; word32 idx = 0;
FILE* file = fopen(keyFile, "rb"); XFILE file = XFOPEN(keyFile, "rb");
if (!file) { if (file != XBADFILE)
{
free(key); free(key);
return 0; return 0;
} }
bytes = fread(tmp, 1, sizeof(tmp), file); bytes = XFREAD(tmp, 1, sizeof(tmp), file);
fclose(file); XFCLOSE(file);
wc_InitRsaKey(key, 0); wc_InitRsaKey(key, 0);
ret = wc_RsaPrivateKeyDecode(tmp, &idx, key, (word32)bytes); ret = wc_RsaPrivateKeyDecode(tmp, &idx, key, (word32)bytes);

316
tests/api.c
View File

@@ -3119,7 +3119,7 @@ static void test_wolfSSL_PKCS12(void)
char order[] = "./certs/ecc-rsa-server.p12"; char order[] = "./certs/ecc-rsa-server.p12";
char pass[] = "a password"; char pass[] = "a password";
WOLFSSL_X509_NAME* subject; WOLFSSL_X509_NAME* subject;
FILE *f; XFILE f;
int bytes, ret; int bytes, ret;
WOLFSSL_BIO *bio; WOLFSSL_BIO *bio;
WOLFSSL_EVP_PKEY *pkey; WOLFSSL_EVP_PKEY *pkey;
@@ -3132,10 +3132,10 @@ static void test_wolfSSL_PKCS12(void)
printf(testingFmt, "wolfSSL_PKCS12()"); printf(testingFmt, "wolfSSL_PKCS12()");
f = fopen(file, "rb"); f = XFOPEN(file, "rb");
AssertNotNull(f); AssertTrue((f != XBADFILE));
bytes = (int)fread(buffer, 1, sizeof(buffer), f); bytes = (int)XFREAD(buffer, 1, sizeof(buffer), f);
fclose(f); XFCLOSE(f);
bio = BIO_new_mem_buf((void*)buffer, bytes); bio = BIO_new_mem_buf((void*)buffer, bytes);
AssertNotNull(bio); AssertNotNull(bio);
@@ -3241,10 +3241,10 @@ static void test_wolfSSL_PKCS12(void)
#ifdef HAVE_ECC #ifdef HAVE_ECC
/* test order of parsing */ /* test order of parsing */
f = fopen(order, "rb"); f = XFOPEN(order, "rb");
AssertNotNull(f); AssertTrue(f != XBADFILE);
bytes = (int)fread(buffer, 1, sizeof(buffer), f); bytes = (int)XFREAD(buffer, 1, sizeof(buffer), f);
fclose(f); XFCLOSE(f);
AssertNotNull(bio = BIO_new_mem_buf((void*)buffer, bytes)); AssertNotNull(bio = BIO_new_mem_buf((void*)buffer, bytes));
AssertNotNull(pkcs12 = d2i_PKCS12_bio(bio, NULL)); AssertNotNull(pkcs12 = d2i_PKCS12_bio(bio, NULL));
@@ -3288,10 +3288,10 @@ static void test_wolfSSL_PKCS12(void)
sk_X509_free(ca); /* TEST d2i_PKCS12_fp */ sk_X509_free(ca); /* TEST d2i_PKCS12_fp */
/* test order of parsing */ /* test order of parsing */
f = fopen(file, "rb"); f = XFOPEN(file, "rb");
AssertTrue(f != XBADFILE);
AssertNotNull(pkcs12 = d2i_PKCS12_fp(f, NULL)); AssertNotNull(pkcs12 = d2i_PKCS12_fp(f, NULL));
fclose(f); XFCLOSE(f);
/* check verify MAC fail case */ /* check verify MAC fail case */
ret = PKCS12_parse(pkcs12, "bad", &pkey, &cert, NULL); ret = PKCS12_parse(pkcs12, "bad", &pkey, &cert, NULL);
@@ -3367,17 +3367,17 @@ static void test_wolfSSL_PKCS8(void)
byte buffer[FOURK_BUF]; byte buffer[FOURK_BUF];
byte der[FOURK_BUF]; byte der[FOURK_BUF];
char file[] = "./certs/server-keyPkcs8Enc.pem"; char file[] = "./certs/server-keyPkcs8Enc.pem";
FILE *f; XFILE f;
int flag = 1; int flag = 1;
int bytes; int bytes;
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
printf(testingFmt, "wolfSSL_PKCS8()"); printf(testingFmt, "wolfSSL_PKCS8()");
f = fopen(file, "rb"); f = XFOPEN(file, "rb");
AssertNotNull(f); AssertTrue((f != XBADFILE));
bytes = (int)fread(buffer, 1, sizeof(buffer), f); bytes = (int)XFREAD(buffer, 1, sizeof(buffer), f);
fclose(f); XFCLOSE(f);
#ifndef NO_WOLFSSL_CLIENT #ifndef NO_WOLFSSL_CLIENT
#ifndef WOLFSSL_NO_TLS12 #ifndef WOLFSSL_NO_TLS12
@@ -11510,12 +11510,12 @@ static int test_wc_DsaSignVerify (void)
#else #else
byte tmp[TWOK_BUF]; byte tmp[TWOK_BUF];
XMEMSET(tmp, 0, sizeof(tmp)); XMEMSET(tmp, 0, sizeof(tmp));
FILE* fp = fopen("./certs/dsa2048.der", "rb"); XFILE fp = XFOPEN("./certs/dsa2048.der", "rb");
if (!fp) { if (fp == XBADFILE) {
return WOLFSSL_BAD_FILE; return WOLFSSL_BAD_FILE;
} }
bytes = (word32) fread(tmp, 1, sizeof(tmp), fp); bytes = (word32) XFREAD(tmp, 1, sizeof(tmp), fp);
fclose(fp); XFCLOSE(fp);
#endif /* END USE_CERT_BUFFERS_1024 */ #endif /* END USE_CERT_BUFFERS_1024 */
ret = wc_InitSha(&sha); ret = wc_InitSha(&sha);
@@ -11634,12 +11634,13 @@ static int test_wc_DsaPublicPrivateKeyDecode (void)
#else #else
byte tmp[TWOK_BUF]; byte tmp[TWOK_BUF];
XMEMSET(tmp, 0, sizeof(tmp)); XMEMSET(tmp, 0, sizeof(tmp));
FILE* fp = fopen("./certs/dsa2048.der", "rb"); XFILE fp = XFOPEN("./certs/dsa2048.der", "rb");
if (!fp) { if (fp == XBADFILE)
{
return WOLFSSL_BAD_FILE; return WOLFSSL_BAD_FILE;
} }
bytes = (word32) fread(tmp, 1, sizeof(tmp), fp); bytes = (word32) XFREAD(tmp, 1, sizeof(tmp), fp);
fclose(fp); XFCLOSE(fp);
#endif /* END USE_CERT_BUFFERS_1024 */ #endif /* END USE_CERT_BUFFERS_1024 */
ret = wc_InitDsaKey(&key); ret = wc_InitDsaKey(&key);
@@ -11809,12 +11810,12 @@ static int test_wc_DsaKeyToDer (void)
byte der[TWOK_BUF]; byte der[TWOK_BUF];
XMEMSET(tmp, 0, sizeof(tmp)); XMEMSET(tmp, 0, sizeof(tmp));
XMEMSET(der, 0, sizeof(der)); XMEMSET(der, 0, sizeof(der));
FILE* fp = fopen("./certs/dsa2048.der", "rb"); XFILE fp = XFOPEN("./certs/dsa2048.der", "rb");
if (!fp) { if (fp == XBADFILE) {
return WOLFSSL_BAD_FILE; return WOLFSSL_BAD_FILE;
} }
bytes = (word32) fread(tmp, 1, sizeof(tmp), fp); bytes = (word32) XFREAD(tmp, 1, sizeof(tmp), fp);
fclose(fp); XFCLOSE(fp);
#endif /* END USE_CERT_BUFFERS_1024 */ #endif /* END USE_CERT_BUFFERS_1024 */
ret = wc_InitRng(&rng); ret = wc_InitRng(&rng);
@@ -14645,14 +14646,13 @@ static void test_wc_PKCS7_InitWithCert (void)
XMEMCPY(cert, client_cert_der_1024, sizeof_client_cert_der_1024); XMEMCPY(cert, client_cert_der_1024, sizeof_client_cert_der_1024);
#else #else
unsigned char cert[ONEK_BUF]; unsigned char cert[ONEK_BUF];
FILE* fp; XFILE fp;
int certSz; int certSz;
fp = fopen("./certs/1024/client-cert.der", "rb"); fp = XFOPEN("./certs/1024/client-cert.der", "rb");
AssertTrue(fp != XBADFILE);
AssertNotNull(fp); certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
XFCLOSE(fp);
certSz = fread(cert, 1, sizeof_client_cert_der_1024, fp);
fclose(fp);
#endif #endif
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC)
#if defined(USE_CERT_BUFFERS_256) #if defined(USE_CERT_BUFFERS_256)
@@ -14662,14 +14662,14 @@ static void test_wc_PKCS7_InitWithCert (void)
XMEMCPY(cert, cliecc_cert_der_256, sizeof_cliecc_cert_der_256); XMEMCPY(cert, cliecc_cert_der_256, sizeof_cliecc_cert_der_256);
#else #else
unsigned char cert[ONEK_BUF]; unsigned char cert[ONEK_BUF];
FILE* fp; XFILE fp;
int certSz; int certSz;
fp = fopen("./certs/client-ecc-cert.der", "rb"); fp = XFOPEN("./certs/client-ecc-cert.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
certSz = fread(cert, 1, sizeof_cliecc_cert_der_256, fp); certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
fclose(fp); XCLOSE(fp);
#endif #endif
#else #else
#error PKCS7 requires ECC or RSA #error PKCS7 requires ECC or RSA
@@ -14730,19 +14730,19 @@ static void test_wc_PKCS7_EncodeData (void)
#else #else
unsigned char cert[ONEK_BUF]; unsigned char cert[ONEK_BUF];
unsigned char key[ONEK_BUF]; unsigned char key[ONEK_BUF];
FILE* fp; XFILE fp;
int certSz; int certSz;
int keySz; int keySz;
fp = fopen("./certs/1024/client-cert.der", "rb"); fp = XFOPEN("./certs/1024/client-cert.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
certSz = fread(cert, 1, sizeof_client_cert_der_1024, fp); certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
fclose(fp); XFCLOSE(fp);
fp = fopen("./certs/1024/client-key.der", "rb"); fp = XOPEN("./certs/1024/client-key.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
keySz = fread(key, 1, sizeof_client_key_der_1024, fp); keySz = XFREAD(key, 1, sizeof_client_key_der_1024, fp);
fclose(fp); XFCLOSE(fp);
#endif #endif
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC)
#if defined(USE_CERT_BUFFERS_256) #if defined(USE_CERT_BUFFERS_256)
@@ -14757,18 +14757,18 @@ static void test_wc_PKCS7_EncodeData (void)
#else #else
unsigned char cert[ONEK_BUF]; unsigned char cert[ONEK_BUF];
unsigned char key[ONEK_BUF]; unsigned char key[ONEK_BUF];
FILE* fp; XFILE fp;
int certSz, keySz; int certSz, keySz;
fp = fopen("./certs/client-ecc-cert.der", "rb"); fp = XFOPEN("./certs/client-ecc-cert.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
certSz = fread(cert, 1, sizeof_cliecc_cert_der_256, fp); certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
fclose(fp); XFCLOSE(fp);
fp = fopen("./certs/client-ecc-key.der", "rb"); fp = XFOPEN("./certs/client-ecc-key.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
keySz = fread(key, 1, sizeof_ecc_clikey_der_256, fp); keySz = XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp);
fclose(fp); XFCLOSE(fp);
#endif #endif
#endif #endif
@@ -14836,19 +14836,19 @@ static void test_wc_PKCS7_EncodeSignedData(void)
#else #else
unsigned char cert[ONEK_BUF]; unsigned char cert[ONEK_BUF];
unsigned char key[ONEK_BUF]; unsigned char key[ONEK_BUF];
FILE* fp; XFILE fp;
int certSz; int certSz;
int keySz; int keySz;
fp = fopen("./certs/1024/client-cert.der", "rb"); fp = XOPEN("./certs/1024/client-cert.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
certSz = fread(cert, 1, sizeof_client_cert_der_1024, fp); certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
fclose(fp); XFCLOSE(fp);
fp = fopen("./certs/1024/client-key.der", "rb"); fp = XFOPEN("./certs/1024/client-key.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
keySz = fread(key, 1, sizeof_client_key_der_1024, fp); keySz = XFREAD(key, 1, sizeof_client_key_der_1024, fp);
fclose(fp); XFCLOSE(fp);
#endif #endif
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC)
#if defined(USE_CERT_BUFFERS_256) #if defined(USE_CERT_BUFFERS_256)
@@ -14863,18 +14863,18 @@ static void test_wc_PKCS7_EncodeSignedData(void)
#else #else
unsigned char cert[ONEK_BUF]; unsigned char cert[ONEK_BUF];
unsigned char key[ONEK_BUF]; unsigned char key[ONEK_BUF];
FILE* fp; XFILE fp;
int certSz, keySz; int certSz, keySz;
fp = fopen("./certs/client-ecc-cert.der", "rb"); fp = XOPEN("./certs/client-ecc-cert.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
certSz = fread(cert, 1, sizeof_cliecc_cert_der_256, fp); certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
fclose(fp); XFCLOSE(fp);
fp = fopen("./certs/client-ecc-key.der", "rb"); fp = XFOPEN("./certs/client-ecc-key.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
keySz = fread(key, 1, sizeof_ecc_clikey_der_256, fp); keySz = XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp);
fclose(fp); XFCLOSE(fp);
#endif #endif
#endif #endif
@@ -14958,19 +14958,19 @@ static void test_wc_PKCS7_EncodeSignedData_ex(void)
#else #else
unsigned char cert[ONEK_BUF]; unsigned char cert[ONEK_BUF];
unsigned char key[ONEK_BUF]; unsigned char key[ONEK_BUF];
FILE* fp; XFILE fp;
int certSz; int certSz;
int keySz; int keySz;
fp = fopen("./certs/1024/client-cert.der", "rb"); fp = XFOPEN("./certs/1024/client-cert.der", "rb");
AssertNotNull(fp); AssertTrue((fp != XBADFILE));
certSz = fread(cert, 1, sizeof_client_cert_der_1024, fp); certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
fclose(fp); XFCLOSE(fp);
fp = fopen("./certs/1024/client-key.der", "rb"); fp = XFOPEN("./certs/1024/client-key.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
keySz = fread(key, 1, sizeof_client_key_der_1024, fp); keySz = XFREAD(key, 1, sizeof_client_key_der_1024, fp);
fclose(fp); XFCLOSE(fp);
#endif #endif
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC)
#if defined(USE_CERT_BUFFERS_256) #if defined(USE_CERT_BUFFERS_256)
@@ -14985,18 +14985,18 @@ static void test_wc_PKCS7_EncodeSignedData_ex(void)
#else #else
unsigned char cert[ONEK_BUF]; unsigned char cert[ONEK_BUF];
unsigned char key[ONEK_BUF]; unsigned char key[ONEK_BUF];
FILE* fp; XFILE fp;
int certSz, keySz; int certSz, keySz;
fp = fopen("./certs/client-ecc-cert.der", "rb"); fp = XFOPEN("./certs/client-ecc-cert.der", "rb");
AssertNotNull(fp); AssertTrue(fp != BUDFILE);
certSz = fread(cert, 1, sizeof_cliecc_cert_der_256, fp); certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
fclose(fp); XFCLOSE(fp);
fp = fopen("./certs/client-ecc-key.der", "rb"); fp = XFOPEN("./certs/client-ecc-key.der", "rb");
AssertNotNull(fp); AssertTrue(fp != XBADFILE);
keySz = fread(key, 1, sizeof_ecc_clikey_der_256, fp); keySz = XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp);
fclose(fp); XFCLOSE(fp);
#endif #endif
#endif #endif
@@ -15267,8 +15267,8 @@ static void test_wc_PKCS7_EncodeDecodeEnvelopedData (void)
byte decoded[sizeof(input)/sizeof(char)]; byte decoded[sizeof(input)/sizeof(char)];
int decodedSz = 0; int decodedSz = 0;
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
FILE* certFile; XFILE certFile;
FILE* keyFile; XFILE keyFile;
#endif #endif
#if !defined(NO_RSA) && (!defined(NO_AES) || (!defined(NO_SHA) ||\ #if !defined(NO_RSA) && (!defined(NO_AES) || (!defined(NO_SHA) ||\
@@ -15300,20 +15300,20 @@ static void test_wc_PKCS7_EncodeDecodeEnvelopedData (void)
#else #else
/* File system. */ /* File system. */
certFile = fopen(rsaClientCert, "rb"); certFile = XFOPEN(rsaClientCert, "rb");
AssertNotNull(certFile); AssertTrue(certFile != XBADFILE);
rsaCertSz = (word32)FOURK_BUF; rsaCertSz = (word32)FOURK_BUF;
AssertNotNull(rsaCert = AssertNotNull(rsaCert =
(byte*)XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER)); (byte*)XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER));
rsaCertSz = (word32)fread(rsaCert, 1, rsaCertSz, certFile); rsaCertSz = (word32)XFREAD(rsaCert, 1, rsaCertSz, certFile);
fclose(certFile); XFCLOSE(certFile);
keyFile = fopen(rsaClientKey, "rb"); keyFile = XFOPEN(rsaClientKey, "rb");
AssertNotNull(keyFile); AssertTrue(keyFile != XBADFILE);
AssertNotNull(rsaPrivKey = (byte*)XMALLOC(FOURK_BUF, HEAP_HINT, AssertNotNull(rsaPrivKey = (byte*)XMALLOC(FOURK_BUF, HEAP_HINT,
DYNAMIC_TYPE_TMP_BUFFER)); DYNAMIC_TYPE_TMP_BUFFER));
rsaPrivKeySz = (word32)FOURK_BUF; rsaPrivKeySz = (word32)FOURK_BUF;
rsaPrivKeySz = (word32)fread(rsaPrivKey, 1, rsaPrivKeySz, keyFile); rsaPrivKeySz = (word32)XFREAD(rsaPrivKey, 1, rsaPrivKeySz, keyFile);
fclose(keyFile); XFCLOSE(keyFile);
#endif /* USE_CERT_BUFFERS */ #endif /* USE_CERT_BUFFERS */
#endif /* NO_RSA */ #endif /* NO_RSA */
@@ -15332,20 +15332,20 @@ static void test_wc_PKCS7_EncodeDecodeEnvelopedData (void)
eccPrivKeySz = (word32)sizeof_ecc_clikey_der_256; eccPrivKeySz = (word32)sizeof_ecc_clikey_der_256;
XMEMCPY(eccPrivKey, ecc_clikey_der_256, eccPrivKeySz); XMEMCPY(eccPrivKey, ecc_clikey_der_256, eccPrivKeySz);
#else /* File system. */ #else /* File system. */
certFile = fopen(eccClientCert, "rb"); certFile = XFOPEN(eccClientCert, "rb");
AssertNotNull(certFile); AssertTrue(certFile != XBADFILE);
eccCertSz = (word32)FOURK_BUF; eccCertSz = (word32)FOURK_BUF;
AssertNotNull(eccCert = AssertNotNull(eccCert =
(byte*)XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER)); (byte*)XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER));
eccCertSz = (word32)fread(eccCert, 1, eccCertSz, certFile); eccCertSz = (word32)XFREAD(eccCert, 1, eccCertSz, certFile);
fclose(certFile); XFCLOSE(certFile);
keyFile = fopen(eccClientKey, "rb"); keyFile = XFOPEN(eccClientKey, "rb");
AssertNotNull(keyFile); AssertTrue(keyFile != XBADFILE);
eccPrivKeySz = (word32)FOURK_BUF; eccPrivKeySz = (word32)FOURK_BUF;
AssertNotNull(eccPrivKey = (byte*)XMALLOC(FOURK_BUF, HEAP_HINT, AssertNotNull(eccPrivKey = (byte*)XMALLOC(FOURK_BUF, HEAP_HINT,
DYNAMIC_TYPE_TMP_BUFFER)); DYNAMIC_TYPE_TMP_BUFFER));
eccPrivKeySz = (word32)fread(eccPrivKey, 1, eccPrivKeySz, keyFile); eccPrivKeySz = (word32)XFREAD(eccPrivKey, 1, eccPrivKeySz, keyFile);
fclose(keyFile); XFCLOSE(keyFile);
#endif /* USE_CERT_BUFFERS_256 */ #endif /* USE_CERT_BUFFERS_256 */
#endif /* END HAVE_ECC */ #endif /* END HAVE_ECC */
@@ -15750,10 +15750,10 @@ static int test_wc_SignatureGetSize_rsa(void)
XMEMCPY(tmp, client_key_der_2048, XMEMCPY(tmp, client_key_der_2048,
(size_t)sizeof_client_key_der_2048); (size_t)sizeof_client_key_der_2048);
#elif !defined(NO_FILESYSTEM) #elif !defined(NO_FILESYSTEM)
file = fopen(clientKey, "rb"); file = XFOPEN(clientKey, "rb");
if (file != NULL) { if (file != XBADFILE) {
bytes = fread(tmp, 1, FOURK_BUF, file); bytes = XFREAD(tmp, 1, FOURK_BUF, file);
fclose(file); XFCLOSE(file);
} }
else { else {
ret = WOLFSSL_FATAL_ERROR; ret = WOLFSSL_FATAL_ERROR;
@@ -15891,7 +15891,7 @@ static void test_wolfSSL_X509_NAME(void)
const unsigned char* c; const unsigned char* c;
unsigned char buf[4096]; unsigned char buf[4096];
int bytes; int bytes;
FILE* f; XFILE f;
const X509_NAME* a; const X509_NAME* a;
const X509_NAME* b; const X509_NAME* b;
int sz; int sz;
@@ -15906,10 +15906,10 @@ static void test_wolfSSL_X509_NAME(void)
AssertNotNull(a = X509_NAME_new()); AssertNotNull(a = X509_NAME_new());
X509_NAME_free((X509_NAME*)a); X509_NAME_free((X509_NAME*)a);
f = fopen(file, "rb"); f = XFOPEN(file, "rb");
AssertNotNull(f); AssertTrue(f != XBADFILE);
bytes = (int)fread(buf, 1, sizeof(buf), f); bytes = (int)XFREAD(buf, 1, sizeof(buf), f);
fclose(f); XFCLOSE(f);
c = buf; c = buf;
AssertNotNull(x509 = wolfSSL_X509_load_certificate_buffer(c, bytes, AssertNotNull(x509 = wolfSSL_X509_load_certificate_buffer(c, bytes,
@@ -16605,7 +16605,8 @@ static void test_wolfSSL_PEM_PrivateKey(void)
AssertNotNull(ctx = SSL_CTX_new(TLSv1_3_server_method())); AssertNotNull(ctx = SSL_CTX_new(TLSv1_3_server_method()));
#endif #endif
AssertNotNull(f = XFOPEN("./certs/ecc-key.der", "rb")); f = XFOPEN("./certs/ecc-key.der", "rb");
AssertTrue((f != XBADFILE));
bytes = XFREAD(buf, 1, sizeof(buf), f); bytes = XFREAD(buf, 1, sizeof(buf), f);
XFCLOSE(f); XFCLOSE(f);
@@ -16711,7 +16712,7 @@ static void test_wolfSSL_tmp_dh(void)
!defined(NO_DH) !defined(NO_DH)
byte buffer[5300]; byte buffer[5300];
char file[] = "./certs/dsaparams.pem"; char file[] = "./certs/dsaparams.pem";
FILE *f; XFILE f;
int bytes; int bytes;
DSA* dsa; DSA* dsa;
DH* dh; DH* dh;
@@ -16726,10 +16727,10 @@ static void test_wolfSSL_tmp_dh(void)
AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLFSSL_FILETYPE_PEM)); AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLFSSL_FILETYPE_PEM));
AssertNotNull(ssl = SSL_new(ctx)); AssertNotNull(ssl = SSL_new(ctx));
f = fopen(file, "rb"); f = XFOPEN(file, "rb");
AssertNotNull(f); AssertTrue((f != XBADFILE));
bytes = (int)fread(buffer, 1, sizeof(buffer), f); bytes = (int)XFREAD(buffer, 1, sizeof(buffer), f);
fclose(f); XFCLOSE(f);
bio = BIO_new_mem_buf((void*)buffer, bytes); bio = BIO_new_mem_buf((void*)buffer, bytes);
AssertNotNull(bio); AssertNotNull(bio);
@@ -17551,7 +17552,8 @@ static void test_wolfSSL_X509_STORE(void)
AssertIntEQ(X509_STORE_add_cert(store, x509), SSL_SUCCESS); AssertIntEQ(X509_STORE_add_cert(store, x509), SSL_SUCCESS);
X509_free(x509); X509_free(x509);
AssertNotNull(fp = XFOPEN(crl_pem, "rb")); fp = XFOPEN(crl_pem, "rb");
AssertTrue((fp != XBADFILE));
AssertNotNull(crl = (X509_CRL *)PEM_read_X509_CRL(fp, (X509_CRL **)NULL, NULL, NULL)); AssertNotNull(crl = (X509_CRL *)PEM_read_X509_CRL(fp, (X509_CRL **)NULL, NULL, NULL));
XFCLOSE(fp); XFCLOSE(fp);
AssertIntEQ(X509_STORE_add_crl(store, crl), SSL_SUCCESS); AssertIntEQ(X509_STORE_add_crl(store, crl), SSL_SUCCESS);
@@ -17874,7 +17876,7 @@ static void test_wolfSSL_PEM_read_bio(void)
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \ #if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \
!defined(NO_FILESYSTEM) && !defined(NO_RSA) !defined(NO_FILESYSTEM) && !defined(NO_RSA)
byte buff[5300]; byte buff[5300];
FILE *f; XFILE f;
int bytes; int bytes;
X509* x509; X509* x509;
BIO* bio = NULL; BIO* bio = NULL;
@@ -17882,9 +17884,10 @@ static void test_wolfSSL_PEM_read_bio(void)
printf(testingFmt, "wolfSSL_PEM_read_bio()"); printf(testingFmt, "wolfSSL_PEM_read_bio()");
AssertNotNull(f = fopen(cliCertFile, "rb")); f = XFOPEN(cliCertFile, "rb");
bytes = (int)fread(buff, 1, sizeof(buff), f); AssertTrue((f != XBADFILE));
fclose(f); bytes = (int)XFREAD(buff, 1, sizeof(buff), f);
XFCLOSE(f);
AssertNull(x509 = PEM_read_bio_X509_AUX(bio, NULL, NULL, NULL)); AssertNull(x509 = PEM_read_bio_X509_AUX(bio, NULL, NULL, NULL));
AssertNotNull(bio = BIO_new_mem_buf((void*)buff, bytes)); AssertNotNull(bio = BIO_new_mem_buf((void*)buff, bytes));
@@ -18065,6 +18068,7 @@ static void test_wolfSSL_BIO(void)
AssertIntEQ((int)BIO_set_mem_eof_return(NULL, -1), 0); AssertIntEQ((int)BIO_set_mem_eof_return(NULL, -1), 0);
f1 = XFOPEN(svrCertFile, "rwb"); f1 = XFOPEN(svrCertFile, "rwb");
AssertTrue((f1 != XBADFILE));
AssertIntEQ((int)BIO_set_fp(f_bio1, f1, BIO_CLOSE), WOLFSSL_SUCCESS); AssertIntEQ((int)BIO_set_fp(f_bio1, f1, BIO_CLOSE), WOLFSSL_SUCCESS);
AssertIntEQ(BIO_write_filename(f_bio2, testFile), AssertIntEQ(BIO_write_filename(f_bio2, testFile),
WOLFSSL_SUCCESS); WOLFSSL_SUCCESS);
@@ -18269,12 +18273,14 @@ static void test_wolfSSL_X509(void)
BIO_free(bio); BIO_free(bio);
/** d2i_X509_fp test **/ /** d2i_X509_fp test **/
AssertNotNull(fp = XFOPEN(der, "rb")); fp = XFOPEN(der, "rb");
AssertTrue((fp != XBADFILE));
AssertNotNull(x509 = (X509 *)d2i_X509_fp(fp, (X509 **)NULL)); AssertNotNull(x509 = (X509 *)d2i_X509_fp(fp, (X509 **)NULL));
AssertNotNull(x509); AssertNotNull(x509);
X509_free(x509); X509_free(x509);
XFCLOSE(fp); XFCLOSE(fp);
AssertNotNull(fp = XFOPEN(der, "rb")); fp = XFOPEN(der, "rb");
AssertTrue((fp != XBADFILE));
AssertNotNull((X509 *)d2i_X509_fp(fp, (X509 **)&x509)); AssertNotNull((X509 *)d2i_X509_fp(fp, (X509 **)&x509));
AssertNotNull(x509); AssertNotNull(x509);
X509_free(x509); X509_free(x509);
@@ -18359,16 +18365,17 @@ static void test_wolfSSL_PKCS8_Compat(void)
#if defined(OPENSSL_EXTRA) && !defined(NO_FILESYSTEM) && defined(HAVE_ECC) #if defined(OPENSSL_EXTRA) && !defined(NO_FILESYSTEM) && defined(HAVE_ECC)
PKCS8_PRIV_KEY_INFO* pt; PKCS8_PRIV_KEY_INFO* pt;
BIO* bio; BIO* bio;
FILE* f; XFILE f;
int bytes; int bytes;
char buffer[512]; char buffer[512];
printf(testingFmt, "wolfSSL_pkcs8()"); printf(testingFmt, "wolfSSL_pkcs8()");
/* file from wolfssl/certs/ directory */ /* file from wolfssl/certs/ directory */
AssertNotNull(f = fopen("./certs/ecc-keyPkcs8.pem", "rb")); f = XFOPEN("./certs/ecc-keyPkcs8.pem", "rb");
AssertIntGT((bytes = (int)fread(buffer, 1, sizeof(buffer), f)), 0); AssertTrue(f != XBADFILE);
fclose(f); AssertIntGT((bytes = (int)XFREAD(buffer, 1, sizeof(buffer), f)), 0);
XFCLOSE(f);
AssertNotNull(bio = BIO_new_mem_buf((void*)buffer, bytes)); AssertNotNull(bio = BIO_new_mem_buf((void*)buffer, bytes));
AssertNotNull(pt = d2i_PKCS8_PRIV_KEY_INFO_bio(bio, NULL)); AssertNotNull(pt = d2i_PKCS8_PRIV_KEY_INFO_bio(bio, NULL));
BIO_free(bio); BIO_free(bio);
@@ -18639,6 +18646,7 @@ static void test_wolfSSL_BIO_gets(void)
AssertIntLE(BIO_gets(f_bio, buffer, bufferSz), 0); AssertIntLE(BIO_gets(f_bio, buffer, bufferSz), 0);
f = XFOPEN(svrCertFile, "rb"); f = XFOPEN(svrCertFile, "rb");
AssertTrue((f != XBADFILE));
AssertIntEQ((int)BIO_set_fp(f_bio, f, BIO_CLOSE), SSL_SUCCESS); AssertIntEQ((int)BIO_set_fp(f_bio, f, BIO_CLOSE), SSL_SUCCESS);
AssertIntGT(BIO_gets(f_bio, buffer, bufferSz), 0); AssertIntGT(BIO_gets(f_bio, buffer, bufferSz), 0);
@@ -19014,7 +19022,8 @@ static void test_wolfSSL_sk_GENERAL_NAME(void)
printf(testingFmt, "wolfSSL_sk_GENERAL_NAME()"); printf(testingFmt, "wolfSSL_sk_GENERAL_NAME()");
AssertNotNull(f = XFOPEN(cliCertDerFile, "rb")); f = XFOPEN(cliCertDerFile, "rb");
AssertTrue((f != XBADFILE));
AssertIntGT((bytes = (int)XFREAD(buf, 1, sizeof(buf), f)), 0); AssertIntGT((bytes = (int)XFREAD(buf, 1, sizeof(buf), f)), 0);
XFCLOSE(f); XFCLOSE(f);
@@ -19946,15 +19955,15 @@ static void test_wc_GetPkcs8TraditionalOffset(void)
int length, derSz; int length, derSz;
word32 inOutIdx; word32 inOutIdx;
const char* path = "./certs/server-keyPkcs8.der"; const char* path = "./certs/server-keyPkcs8.der";
FILE* file; XFILE file;
byte der[2048]; byte der[2048];
printf(testingFmt, "wc_GetPkcs8TraditionalOffset"); printf(testingFmt, "wc_GetPkcs8TraditionalOffset");
file = fopen(path, "rb"); file = XFOPEN(path, "rb");
AssertNotNull(file); AssertTrue(file != XBADFILE);
derSz = (int)fread(der, 1, sizeof(der), file); derSz = (int)XFREAD(der, 1, sizeof(der), file);
fclose(file); XFCLOSE(file);
/* valid case */ /* valid case */
inOutIdx = 0; inOutIdx = 0;
@@ -21060,12 +21069,14 @@ static void test_wolfSSL_X509_CRL(void)
for (i = 0; pem[i][0] != '\0'; i++) for (i = 0; pem[i][0] != '\0'; i++)
{ {
AssertNotNull(fp = XFOPEN(pem[i], "rb")); fp = XFOPEN(pem[i], "rb");
AssertTrue((fp != XBADFILE));
AssertNotNull(crl = (X509_CRL *)PEM_read_X509_CRL(fp, (X509_CRL **)NULL, NULL, NULL)); AssertNotNull(crl = (X509_CRL *)PEM_read_X509_CRL(fp, (X509_CRL **)NULL, NULL, NULL));
AssertNotNull(crl); AssertNotNull(crl);
X509_CRL_free(crl); X509_CRL_free(crl);
XFCLOSE(fp); XFCLOSE(fp);
AssertNotNull(fp = XFOPEN(pem[i], "rb")); fp = XFOPEN(pem[i], "rb");
AssertTrue((fp != XBADFILE));
AssertNotNull((X509_CRL *)PEM_read_X509_CRL(fp, (X509_CRL **)&crl, NULL, NULL)); AssertNotNull((X509_CRL *)PEM_read_X509_CRL(fp, (X509_CRL **)&crl, NULL, NULL));
AssertNotNull(crl); AssertNotNull(crl);
X509_CRL_free(crl); X509_CRL_free(crl);
@@ -21074,12 +21085,14 @@ static void test_wolfSSL_X509_CRL(void)
#ifdef HAVE_TEST_d2i_X509_CRL_fp #ifdef HAVE_TEST_d2i_X509_CRL_fp
for(i = 0; der[i][0] != '\0'; i++){ for(i = 0; der[i][0] != '\0'; i++){
AssertNotNull(fp = XFOPEN(der[i], "rb")); fp = XFOPEN(der[i], "rb");
AssertTrue((fp != XBADFILE));
AssertNotNull(crl = (X509_CRL *)d2i_X509_CRL_fp((fp, X509_CRL **)NULL)); AssertNotNull(crl = (X509_CRL *)d2i_X509_CRL_fp((fp, X509_CRL **)NULL));
AssertNotNull(crl); AssertNotNull(crl);
X509_CRL_free(crl); X509_CRL_free(crl);
XFCLOSE(fp); XFCLOSE(fp);
AssertNotNull(fp = XFOPEN(der[i], "rb")); fp = XFOPEN(der[i], "rb");
AssertTrue((fp != XBADFILE));
AssertNotNull((X509_CRL *)d2i_X509_CRL_fp(fp, (X509_CRL **)&crl)); AssertNotNull((X509_CRL *)d2i_X509_CRL_fp(fp, (X509_CRL **)&crl));
AssertNotNull(crl); AssertNotNull(crl);
X509_CRL_free(crl); X509_CRL_free(crl);
@@ -21099,7 +21112,8 @@ static void test_wolfSSL_PEM_read_X509(void)
XFILE fp; XFILE fp;
printf(testingFmt, "wolfSSL_PEM_read_X509"); printf(testingFmt, "wolfSSL_PEM_read_X509");
AssertNotNull(fp = XFOPEN(svrCertFile, "rb")); fp = XFOPEN(svrCertFile, "rb");
AssertTrue((fp != XBADFILE));
AssertNotNull(x509 = (X509 *)PEM_read_X509(fp, (X509 **)NULL, NULL, NULL)); AssertNotNull(x509 = (X509 *)PEM_read_X509(fp, (X509 **)NULL, NULL, NULL));
X509_free(x509); X509_free(x509);
XFCLOSE(fp); XFCLOSE(fp);
@@ -21292,7 +21306,7 @@ static void test_wolfSSL_RSA_verify()
{ {
#if defined(OPENSSL_EXTRA) && !defined(NO_RSA) && !defined(HAVE_FAST_RSA) && \ #if defined(OPENSSL_EXTRA) && !defined(NO_RSA) && !defined(HAVE_FAST_RSA) && \
!defined(NO_FILESYSTEM) && defined(HAVE_CRL) !defined(NO_FILESYSTEM) && defined(HAVE_CRL)
FILE *fp; XFILE fp;
RSA *pKey, *pubKey; RSA *pKey, *pubKey;
X509 *cert; X509 *cert;
const char *text = "Hello wolfSSL !"; const char *text = "Hello wolfSSL !";
@@ -21314,6 +21328,7 @@ static void test_wolfSSL_RSA_verify()
/* read privete key file */ /* read privete key file */
fp = XFOPEN(svrKeyFile, "r"); fp = XFOPEN(svrKeyFile, "r");
AssertTrue((fp != XBADFILE));
XFSEEK(fp, 0, XSEEK_END); XFSEEK(fp, 0, XSEEK_END);
sz = XFTELL(fp); sz = XFTELL(fp);
XREWIND(fp); XREWIND(fp);
@@ -21330,6 +21345,7 @@ static void test_wolfSSL_RSA_verify()
/* read public key and verify signed data */ /* read public key and verify signed data */
fp = XFOPEN(svrCertFile,"r"); fp = XFOPEN(svrCertFile,"r");
AssertTrue((fp != XBADFILE));
cert = PEM_read_X509(fp, 0, 0, 0 ); cert = PEM_read_X509(fp, 0, 0, 0 );
XFCLOSE(fp); XFCLOSE(fp);
evpPubkey = X509_get_pubkey(cert); evpPubkey = X509_get_pubkey(cert);

2
wolfcrypt/benchmark/benchmark.c
View File

@@ -407,7 +407,7 @@ static const bench_alg bench_other_opt[] = {
#endif #endif
#if defined(WOLFSSL_MDK_ARM) #if defined(WOLFSSL_MDK_ARM)
extern FILE * wolfSSL_fopen(const char *fname, const char *mode); extern XFILE wolfSSL_fopen(const char *fname, const char *mode);
#define fopen wolfSSL_fopen #define fopen wolfSSL_fopen
#endif #endif

15
wolfcrypt/src/logging.c
View File

@@ -732,17 +732,20 @@ void wc_ERR_print_errors_fp(XFILE fp)
{ {
WOLFSSL_ENTER("wc_ERR_print_errors_fp"); WOLFSSL_ENTER("wc_ERR_print_errors_fp");
if (wc_LockMutex(&debug_mutex) != 0) { if (wc_LockMutex(&debug_mutex) != 0)
{
WOLFSSL_MSG("Lock debug mutex failed"); WOLFSSL_MSG("Lock debug mutex failed");
} }
else { else
{
/* free all nodes from error queue and print them to file */ /* free all nodes from error queue and print them to file */
{ {
struct wc_error_queue* current; struct wc_error_queue *current;
struct wc_error_queue* next; struct wc_error_queue *next;
current = (struct wc_error_queue*)wc_errors; current = (struct wc_error_queue *)wc_errors;
while (current != NULL) { while (current != NULL)
{
next = current->next; next = current->next;
fprintf(fp, "%s\n", current->error); fprintf(fp, "%s\n", current->error);
XFREE(current, current->heap, DYNAMIC_TYPE_LOG); XFREE(current, current->heap, DYNAMIC_TYPE_LOG);

22
wolfssl/openssl/pem.h
View File

@@ -55,18 +55,18 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
unsigned char **pem, int *plen); unsigned char **pem, int *plen);
#if !defined(NO_FILESYSTEM) #if !defined(NO_FILESYSTEM)
WOLFSSL_API WOLFSSL_API
int wolfSSL_PEM_write_RSAPrivateKey(FILE *fp, WOLFSSL_RSA *rsa, int wolfSSL_PEM_write_RSAPrivateKey(XFILE fp, WOLFSSL_RSA *rsa,
const EVP_CIPHER *enc, const EVP_CIPHER *enc,
unsigned char *kstr, int klen, unsigned char *kstr, int klen,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
WOLFSSL_API WOLFSSL_API
WOLFSSL_RSA *wolfSSL_PEM_read_RSAPublicKey(FILE *fp, WOLFSSL_RSA **x, WOLFSSL_RSA *wolfSSL_PEM_read_RSAPublicKey(XFILE fp, WOLFSSL_RSA **x,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
WOLFSSL_API WOLFSSL_API
int wolfSSL_PEM_write_RSAPublicKey(FILE *fp, WOLFSSL_RSA *x); int wolfSSL_PEM_write_RSAPublicKey(XFILE fp, WOLFSSL_RSA *x);
WOLFSSL_API WOLFSSL_API
int wolfSSL_PEM_write_RSA_PUBKEY(FILE *fp, WOLFSSL_RSA *x); int wolfSSL_PEM_write_RSA_PUBKEY(XFILE fp, WOLFSSL_RSA *x);
#endif /* NO_FILESYSTEM */ #endif /* NO_FILESYSTEM */
/* DSA */ /* DSA */
@@ -83,12 +83,12 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa,
unsigned char **pem, int *plen); unsigned char **pem, int *plen);
#if !defined(NO_FILESYSTEM) #if !defined(NO_FILESYSTEM)
WOLFSSL_API WOLFSSL_API
int wolfSSL_PEM_write_DSAPrivateKey(FILE *fp, WOLFSSL_DSA *dsa, int wolfSSL_PEM_write_DSAPrivateKey(XFILE fp, WOLFSSL_DSA *dsa,
const EVP_CIPHER *enc, const EVP_CIPHER *enc,
unsigned char *kstr, int klen, unsigned char *kstr, int klen,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
WOLFSSL_API WOLFSSL_API
int wolfSSL_PEM_write_DSA_PUBKEY(FILE *fp, WOLFSSL_DSA *x); int wolfSSL_PEM_write_DSA_PUBKEY(XFILE fp, WOLFSSL_DSA *x);
#endif /* NO_FILESYSTEM */ #endif /* NO_FILESYSTEM */
/* ECC */ /* ECC */
@@ -104,12 +104,12 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* key,
unsigned char **pem, int *plen); unsigned char **pem, int *plen);
#if !defined(NO_FILESYSTEM) #if !defined(NO_FILESYSTEM)
WOLFSSL_API WOLFSSL_API
int wolfSSL_PEM_write_ECPrivateKey(FILE *fp, WOLFSSL_EC_KEY *key, int wolfSSL_PEM_write_ECPrivateKey(XFILE fp, WOLFSSL_EC_KEY *key,
const EVP_CIPHER *enc, const EVP_CIPHER *enc,
unsigned char *kstr, int klen, unsigned char *kstr, int klen,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
WOLFSSL_API WOLFSSL_API
int wolfSSL_PEM_write_EC_PUBKEY(FILE *fp, WOLFSSL_EC_KEY *key); int wolfSSL_PEM_write_EC_PUBKEY(XFILE fp, WOLFSSL_EC_KEY *key);
#endif /* NO_FILESYSTEM */ #endif /* NO_FILESYSTEM */
/* EVP_KEY */ /* EVP_KEY */
@@ -130,13 +130,13 @@ int wolfSSL_PEM_write_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key,
#if !defined(NO_FILESYSTEM) #if !defined(NO_FILESYSTEM)
WOLFSSL_API WOLFSSL_API
WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PUBKEY(FILE *fp, EVP_PKEY **x, WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PUBKEY(XFILE fp, EVP_PKEY **x,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
WOLFSSL_API WOLFSSL_API
WOLFSSL_X509 *wolfSSL_PEM_read_X509(FILE *fp, WOLFSSL_X509 **x, WOLFSSL_X509 *wolfSSL_PEM_read_X509(XFILE fp, WOLFSSL_X509 **x,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
WOLFSSL_API WOLFSSL_API
WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PrivateKey(FILE *fp, WOLFSSL_EVP_PKEY **x, WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PrivateKey(XFILE fp, WOLFSSL_EVP_PKEY **x,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
#endif /* NO_FILESYSTEM */ #endif /* NO_FILESYSTEM */

2
wolfssl/ssl.h
View File

@@ -2806,7 +2806,7 @@ WOLFSSL_API void wolfSSL_ERR_remove_thread_state(void*);
#define WOLFSSL_ERR_remove_thread_state wolfSSL_ERR_remove_thread_state #define WOLFSSL_ERR_remove_thread_state wolfSSL_ERR_remove_thread_state
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
WOLFSSL_API void wolfSSL_print_all_errors_fp(XFILE *fp); WOLFSSL_API void wolfSSL_print_all_errors_fp(XFILE fp);
#endif #endif
WOLFSSL_API void wolfSSL_THREADID_set_callback(void (*threadid_func)(void*)); WOLFSSL_API void wolfSSL_THREADID_set_callback(void (*threadid_func)(void*));

6
wolfssl/test.h
View File

@@ -1057,7 +1057,7 @@ static WC_INLINE void tcp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
if (ready_file) { if (ready_file) {
#if !defined(NO_FILESYSTEM) || defined(FORCE_BUFFER_TEST) #if !defined(NO_FILESYSTEM) || defined(FORCE_BUFFER_TEST)
FILE* srf = NULL; XFILE srf = NULL;
if (args) if (args)
ready = args->signal; ready = args->signal;
@@ -1331,7 +1331,7 @@ static WC_INLINE void OCSPRespFreeCb(void* ioCtx, unsigned char* response)
{ {
int ret; int ret;
long int fileSz; long int fileSz;
FILE* file; XFILE file;
if (fname == NULL || buf == NULL || bufLen == NULL) if (fname == NULL || buf == NULL || bufLen == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@@ -1654,7 +1654,7 @@ static WC_INLINE void CaCb(unsigned char* der, int sz, int type)
{ {
#if !defined(NO_FILESYSTEM) || defined(FORCE_BUFFER_TEST) #if !defined(NO_FILESYSTEM) || defined(FORCE_BUFFER_TEST)
int depth, res; int depth, res;
FILE* file; XFILE file;
for(depth = 0; depth <= MAX_WOLF_ROOT_DEPTH; depth++) { for(depth = 0; depth <= MAX_WOLF_ROOT_DEPTH; depth++) {
file = fopen(ntruKeyFile, "rb"); file = fopen(ntruKeyFile, "rb");
if (file != NULL) { if (file != NULL) {

2
wolfssl/wolfcrypt/settings.h
View File

@@ -564,7 +564,7 @@ extern void uITRON4_free(void *p) ;
#include "tm/tmonitor.h" #include "tm/tmonitor.h"
/* static char* gets(char *buff); */ /* static char* gets(char *buff); */
static char* fgets(char *buff, int sz, FILE *fp) { static char* fgets(char *buff, int sz, XFILE fp) {
char * p = buff; char * p = buff;
*p = '\0'; *p = '\0';
while (1) { while (1) {