Skip to content

Commit 7d04a53

Browse files
Update X509_get_default_cert_* stubs to return empty strings.
According to the documentation, these functions must return static strings, so NULL was not valid. Fixes #6474.
1 parent 6145f3a commit 7d04a53

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/x509.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3448,25 +3448,25 @@ int wolfSSL_X509_pubkey_digest(const WOLFSSL_X509 *x509,
34483448
const char* wolfSSL_X509_get_default_cert_file_env(void)
34493449
{
34503450
WOLFSSL_STUB("X509_get_default_cert_file_env");
3451-
return NULL;
3451+
return "";
34523452
}
34533453

34543454
const char* wolfSSL_X509_get_default_cert_file(void)
34553455
{
34563456
WOLFSSL_STUB("X509_get_default_cert_file");
3457-
return NULL;
3457+
return "";
34583458
}
34593459

34603460
const char* wolfSSL_X509_get_default_cert_dir_env(void)
34613461
{
34623462
WOLFSSL_STUB("X509_get_default_cert_dir_env");
3463-
return NULL;
3463+
return "";
34643464
}
34653465

34663466
const char* wolfSSL_X509_get_default_cert_dir(void)
34673467
{
34683468
WOLFSSL_STUB("X509_get_default_cert_dir");
3469-
return NULL;
3469+
return "";
34703470
}
34713471
#endif
34723472

tests/api/test_ossl_x509.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -528,10 +528,10 @@ int test_wolfSSL_X509(void)
528528
ExpectIntEQ(X509_verify_cert(ctx), SSL_SUCCESS);
529529

530530
#ifndef NO_WOLFSSL_STUB
531-
ExpectNull(X509_get_default_cert_file_env());
532-
ExpectNull(X509_get_default_cert_file());
533-
ExpectNull(X509_get_default_cert_dir_env());
534-
ExpectNull(X509_get_default_cert_dir());
531+
ExpectStrEQ(X509_get_default_cert_file_env(), "");
532+
ExpectStrEQ(X509_get_default_cert_file(), "");
533+
ExpectStrEQ(X509_get_default_cert_dir_env(), "");
534+
ExpectStrEQ(X509_get_default_cert_dir(), "");
535535
#endif
536536

537537
ExpectNull(wolfSSL_X509_get_der(NULL, NULL));

0 commit comments

Comments
 (0)