Skip to content

Commit 7655046

Browse files
dgarskedgarske
committed
Fixes build with NO_STDIO_FILESYSTEM defined.
1 parent a4affd9 commit 7655046

6 files changed

Lines changed: 25 additions & 12 deletions

File tree

‎src/crl.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,8 @@ int CheckCertCRL_ex(WOLFSSL_CRL* crl, byte* issuerHash, byte* serial,
489489

490490
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
491491
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
492-
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
492+
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR) && \
493+
!defined(NO_STDIO_FILESYSTEM)
493494
/* if not find entry in the CRL list, it looks at the folder that sets */
494495
/* by LOOKUP_ctrl because user would want to use hash_dir. */
495496
/* Loading <issuer-hash>.rN form CRL file if find at the folder, */

‎src/internal.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13577,7 +13577,8 @@ static void FreeProcPeerCertArgs(WOLFSSL* ssl, void* pArgs)
1357713577
}
1357813578
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
1357913579
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
13580-
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
13580+
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR) && \
13581+
!defined(NO_STDIO_FILESYSTEM)
1358113582
/* load certificate file which has the form <hash>.(r)N[0..N] */
1358213583
/* in the folder. */
1358313584
/* (r), in the case of CRL file */
@@ -14487,7 +14488,8 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
1448714488
&subjectHash, &alreadySigner);
1448814489
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
1448914490
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
14490-
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
14491+
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR) && \
14492+
!defined(NO_STDIO_FILESYSTEM)
1449114493
if (ret == ASN_NO_SIGNER_E || ret == ASN_SELF_SIGNED_E) {
1449214494
WOLFSSL_MSG("try to load certificate if hash dir is set");
1449314495
ret = LoadCertByIssuer(SSL_STORE(ssl),
@@ -14773,7 +14775,8 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
1477314775
&subjectHash, &alreadySigner);
1477414776
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
1477514777
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
14776-
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
14778+
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR) && \
14779+
!defined(NO_STDIO_FILESYSTEM)
1477714780
if (ret == ASN_NO_SIGNER_E || ret == ASN_SELF_SIGNED_E) {
1477814781
int lastErr = ret; /* save error from last time */
1477914782
WOLFSSL_MSG("try to load certificate if hash dir is set");

‎src/ssl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35385,7 +35385,7 @@ void wolfSSL_PKCS12_PBE_add(void)
3538535385
WOLFSSL_ENTER("wolfSSL_PKCS12_PBE_add");
3538635386
}
3538735387

35388-
#if !defined(NO_FILESYSTEM)
35388+
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
3538935389
WOLFSSL_X509_PKCS12 *wolfSSL_d2i_PKCS12_fp(XFILE fp,
3539035390
WOLFSSL_X509_PKCS12 **pkcs12)
3539135391
{

‎src/ssl_bn.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2303,7 +2303,8 @@ int wolfSSL_BN_is_prime_ex(const WOLFSSL_BIGNUM *bn, int checks,
23032303
* Print APIs
23042304
******************************************************************************/
23052305

2306-
#if !defined(NO_FILESYSTEM) && defined(XFPRINTF)
2306+
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) && \
2307+
defined(XFPRINTF)
23072308
/* Print big number to file pointer.
23082309
*
23092310
* Return code compliant with OpenSSL.

‎src/x509.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7973,7 +7973,7 @@ WOLFSSL_API WOLFSSL_X509_CRL *wolfSSL_d2i_X509_CRL_bio(WOLFSSL_BIO *bp,
79737973
}
79747974
#endif
79757975

7976-
#ifndef NO_FILESYSTEM
7976+
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
79777977
WOLFSSL_X509_CRL *wolfSSL_d2i_X509_CRL_fp(XFILE fp, WOLFSSL_X509_CRL **crl)
79787978
{
79797979
WOLFSSL_ENTER("wolfSSL_d2i_X509_CRL_fp");

‎tests/api.c‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11589,6 +11589,7 @@ static int test_wolfSSL_PKCS12(void)
1158911589
* Password Key
1159011590
*/
1159111591
#if defined(OPENSSL_EXTRA) && !defined(NO_DES3) && !defined(NO_FILESYSTEM) && \
11592+
!defined(NO_STDIO_FILESYSTEM) && \
1159211593
!defined(NO_ASN) && !defined(NO_PWDBASED) && !defined(NO_RSA) && \
1159311594
!defined(NO_SHA) && defined(HAVE_PKCS12) && !defined(NO_BIO)
1159411595
byte buf[6000];
@@ -37684,13 +37685,15 @@ static int test_wolfSSL_BN(void)
3768437685
ExpectIntLT(BN_cmp(a, c), 0);
3768537686
ExpectIntGT(BN_cmp(c, b), 0);
3768637687

37688+
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
3768737689
ExpectIntEQ(BN_print_fp(XBADFILE, NULL), 0);
3768837690
ExpectIntEQ(BN_print_fp(XBADFILE, &emptyBN), 0);
3768937691
ExpectIntEQ(BN_print_fp(stderr, NULL), 0);
3769037692
ExpectIntEQ(BN_print_fp(stderr, &emptyBN), 0);
3769137693
ExpectIntEQ(BN_print_fp(XBADFILE, a), 0);
3769237694

3769337695
ExpectIntEQ(BN_print_fp(stderr, a), 1);
37696+
#endif
3769437697

3769537698
BN_clear(a);
3769637699

@@ -43330,7 +43333,8 @@ static int test_wolfSSL_OBJ(void)
4333043333
EXPECT_DECLS;
4333143334
#if defined(OPENSSL_EXTRA) && !defined(NO_SHA256) && !defined(NO_ASN) && \
4333243335
!defined(HAVE_FIPS) && !defined(NO_SHA) && defined(WOLFSSL_CERT_EXT) && \
43333-
defined(WOLFSSL_CERT_GEN) && !defined(NO_BIO)
43336+
defined(WOLFSSL_CERT_GEN) && !defined(NO_BIO) && \
43337+
!defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
4333443338
ASN1_OBJECT *obj = NULL;
4333543339
ASN1_OBJECT *obj2 = NULL;
4333643340
char buf[50];
@@ -54718,7 +54722,7 @@ static int test_wolfSSL_X509_load_crl_file(void)
5471854722
{
5471954723
EXPECT_DECLS;
5472054724
#if defined(OPENSSL_EXTRA) && defined(HAVE_CRL) && !defined(NO_FILESYSTEM) && \
54721-
!defined(NO_RSA) && !defined(NO_BIO)
54725+
!defined(NO_STDIO_FILESYSTEM) && !defined(NO_RSA) && !defined(NO_BIO)
5472254726
int i;
5472354727
char pem[][100] = {
5472454728
"./certs/crl/crl.pem",
@@ -57120,6 +57124,7 @@ static int test_wolfSSL_RSA_print(void)
5712057124
{
5712157125
EXPECT_DECLS;
5712257126
#if defined(OPENSSL_EXTRA) && !defined(NO_FILESYSTEM) && \
57127+
!defined(NO_STDIO_FILESYSTEM) && \
5712357128
!defined(NO_RSA) && defined(WOLFSSL_KEY_GEN) && \
5712457129
!defined(NO_BIO) && defined(XFPRINTF)
5712557130
BIO *bio = NULL;
@@ -59831,23 +59836,26 @@ static int test_wolfSSL_EC_POINT(void)
5983159836
/* check bn2hex */
5983259837
hexStr = BN_bn2hex(k);
5983359838
ExpectStrEQ(hexStr, kTest);
59834-
#if !defined(NO_FILESYSTEM) && defined(XFPRINTF)
59839+
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) && \
59840+
defined(XFPRINTF)
5983559841
BN_print_fp(stderr, k);
5983659842
fprintf(stderr, "\n");
5983759843
#endif
5983859844
XFREE(hexStr, NULL, DYNAMIC_TYPE_ECC);
5983959845

5984059846
hexStr = BN_bn2hex(Gx);
5984159847
ExpectStrEQ(hexStr, kGx);
59842-
#if !defined(NO_FILESYSTEM) && defined(XFPRINTF)
59848+
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) && \
59849+
defined(XFPRINTF)
5984359850
BN_print_fp(stderr, Gx);
5984459851
fprintf(stderr, "\n");
5984559852
#endif
5984659853
XFREE(hexStr, NULL, DYNAMIC_TYPE_ECC);
5984759854

5984859855
hexStr = BN_bn2hex(Gy);
5984959856
ExpectStrEQ(hexStr, kGy);
59850-
#if !defined(NO_FILESYSTEM) && defined(XFPRINTF)
59857+
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) && \
59858+
defined(XFPRINTF)
5985159859
BN_print_fp(stderr, Gy);
5985259860
fprintf(stderr, "\n");
5985359861
#endif

0 commit comments

Comments
 (0)