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

Fix unguarded XFPRINTF calls

Browse Source
This commit is contained in:
Eric Blankenhorn
2022-12-27 16:36:06 -06:00
parent 67fe575896
commit 004705b38f
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ssl.c
View File

@ -4529,7 +4529,8 @@ int wolfSSL_CertManagerUnload_trust_peers(WOLFSSL_CERT_MANAGER* cm)
#endif /* NO_CERTS */ #endif /* NO_CERTS */
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) #if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) \
&& defined(XFPRINTF)
void wolfSSL_ERR_print_errors_fp(XFILE fp, int err) void wolfSSL_ERR_print_errors_fp(XFILE fp, int err)
{ {
@ -4553,7 +4554,7 @@ void wolfSSL_ERR_print_errors_cb (int (*cb)(const char *str, size_t len,
wc_ERR_print_errors_cb(cb, u); wc_ERR_print_errors_cb(cb, u);
} }
#endif #endif
#endif #endif /* !NO_FILESYSTEM && !NO_STDIO_FILESYSTEM && XFPRINTF */
/* /*
* TODO This ssl parameter needs to be changed to const once our ABI checker * TODO This ssl parameter needs to be changed to const once our ABI checker
@ -36937,7 +36938,7 @@ char *wolfSSL_BN_bn2hex(const WOLFSSL_BIGNUM *bn)
return buf; return buf;
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && defined(XFPRINTF)
/* return code compliant with OpenSSL : /* return code compliant with OpenSSL :
* 1 if success, 0 if error * 1 if success, 0 if error
*/ */
@ -36968,7 +36969,7 @@ int wolfSSL_BN_print_fp(XFILE fp, const WOLFSSL_BIGNUM *bn)
return ret; return ret;
} }
#endif /* !NO_FILESYSTEM */ #endif /* !NO_FILESYSTEM && XFPRINTF */
WOLFSSL_BIGNUM *wolfSSL_BN_CTX_get(WOLFSSL_BN_CTX *ctx) WOLFSSL_BIGNUM *wolfSSL_BN_CTX_get(WOLFSSL_BN_CTX *ctx)

8
tests/api.c
View File

@ -3875,7 +3875,7 @@ static int test_wolfSSL_EC(void)
/* check bn2hex */ /* check bn2hex */
hexStr = BN_bn2hex(k); hexStr = BN_bn2hex(k);
AssertStrEQ(hexStr, kTest); AssertStrEQ(hexStr, kTest);
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && defined(XFPRINTF)
BN_print_fp(stderr, k); BN_print_fp(stderr, k);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
#endif #endif
@ -3883,7 +3883,7 @@ static int test_wolfSSL_EC(void)
hexStr = BN_bn2hex(Gx); hexStr = BN_bn2hex(Gx);
AssertStrEQ(hexStr, kGx); AssertStrEQ(hexStr, kGx);
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && defined(XFPRINTF)
BN_print_fp(stderr, Gx); BN_print_fp(stderr, Gx);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
#endif #endif
@ -3891,7 +3891,7 @@ static int test_wolfSSL_EC(void)
hexStr = BN_bn2hex(Gy); hexStr = BN_bn2hex(Gy);
AssertStrEQ(hexStr, kGy); AssertStrEQ(hexStr, kGy);
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && defined(XFPRINTF)
BN_print_fp(stderr, Gy); BN_print_fp(stderr, Gy);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
#endif #endif
@ -53327,7 +53327,7 @@ static int test_wolfSSL_RSA_print(void)
int res = TEST_SKIPPED; int res = TEST_SKIPPED;
#if defined(OPENSSL_EXTRA) && !defined(NO_FILESYSTEM) && \ #if defined(OPENSSL_EXTRA) && !defined(NO_FILESYSTEM) && \
!defined(NO_RSA) && !defined(HAVE_FAST_RSA) && defined(WOLFSSL_KEY_GEN) && \ !defined(NO_RSA) && !defined(HAVE_FAST_RSA) && defined(WOLFSSL_KEY_GEN) && \
!defined(HAVE_FAST_RSA) && !defined(NO_BIO) !defined(HAVE_FAST_RSA) && !defined(NO_BIO) && defined(XFPRINTF)
BIO *bio; BIO *bio;
WOLFSSL_RSA* rsa = NULL; WOLFSSL_RSA* rsa = NULL;