Fix pedantic errors about macros in macros

pull/4012/head
Juliusz Sosinowicz 2021-07-07 10:44:34 +02:00
parent fc7533fe5e
commit b7bd3766c7
1 changed files with 19 additions and 21 deletions

View File

@ -1700,17 +1700,15 @@ static void test_wolfSSL_CTX_load_verify_locations_ex(void)
WOLFSSL_LOAD_FLAG_NONE)); WOLFSSL_LOAD_FLAG_NONE));
/* test expired CA */ /* test expired CA */
AssertTrue(
#ifndef OPENSSL_COMPATIBLE_DEFAULTS #ifndef OPENSSL_COMPATIBLE_DEFAULTS
WOLFSSL_SUCCESS != AssertIntNE(wolfSSL_CTX_load_verify_locations_ex(ctx, ca_expired_cert, NULL,
WOLFSSL_LOAD_FLAG_NONE), WOLFSSL_SUCCESS);
#else #else
WOLFSSL_SUCCESS == AssertIntEQ(wolfSSL_CTX_load_verify_locations_ex(ctx, ca_expired_cert, NULL,
WOLFSSL_LOAD_FLAG_NONE), WOLFSSL_SUCCESS);
#endif #endif
wolfSSL_CTX_load_verify_locations_ex(ctx, ca_expired_cert, NULL, AssertIntEQ(wolfSSL_CTX_load_verify_locations_ex(ctx, ca_expired_cert, NULL,
WOLFSSL_LOAD_FLAG_NONE)); WOLFSSL_LOAD_FLAG_DATE_ERR_OKAY), WOLFSSL_SUCCESS);
AssertTrue(WOLFSSL_SUCCESS ==
wolfSSL_CTX_load_verify_locations_ex(ctx, ca_expired_cert, NULL,
WOLFSSL_LOAD_FLAG_DATE_ERR_OKAY));
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);
@ -1749,21 +1747,21 @@ static void test_wolfSSL_CTX_load_verify_buffer_ex(void)
XFCLOSE(fp); XFCLOSE(fp);
/* test expired CA failure */ /* test expired CA failure */
AssertTrue(
#ifndef OPENSSL_COMPATIBLE_DEFAULTS
WOLFSSL_SUCCESS !=
#else
WOLFSSL_SUCCESS ==
#endif
wolfSSL_CTX_load_verify_buffer_ex(ctx, ca_expired_cert,
sizeof_ca_expired_cert, WOLFSSL_FILETYPE_ASN1, 0,
WOLFSSL_LOAD_FLAG_NONE));
/* test expired CA success */
AssertTrue(WOLFSSL_SUCCESS == #ifndef OPENSSL_COMPATIBLE_DEFAULTS
wolfSSL_CTX_load_verify_buffer_ex(ctx, ca_expired_cert, AssertIntNE(wolfSSL_CTX_load_verify_buffer_ex(ctx, ca_expired_cert,
sizeof_ca_expired_cert, WOLFSSL_FILETYPE_ASN1, 0, sizeof_ca_expired_cert, WOLFSSL_FILETYPE_ASN1, 0,
WOLFSSL_LOAD_FLAG_DATE_ERR_OKAY)); WOLFSSL_LOAD_FLAG_NONE), WOLFSSL_SUCCESS);
#else
AssertIntEQ(wolfSSL_CTX_load_verify_buffer_ex(ctx, ca_expired_cert,
sizeof_ca_expired_cert, WOLFSSL_FILETYPE_ASN1, 0,
WOLFSSL_LOAD_FLAG_NONE), WOLFSSL_SUCCESS);
#endif
/* test expired CA success */
AssertIntEQ(wolfSSL_CTX_load_verify_buffer_ex(ctx, ca_expired_cert,
sizeof_ca_expired_cert, WOLFSSL_FILETYPE_ASN1, 0,
WOLFSSL_LOAD_FLAG_DATE_ERR_OKAY), WOLFSSL_SUCCESS);
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);