Skip to content

Apple Cert Fix: Prevent verify callback from blocking ANCV invocation #9667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bigbrett wants to merge 2 commits into
base: master
Choose a base branch
from
+31 −35
Draft

Apple Cert Fix: Prevent verify callback from blocking ANCV invocation #9667

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b93751a
Prevent verify callback from blocking ANCV invocation when verify
bigbrett Jan 14, 2026
f82878b
ANCV: support server-side policy creation
bigbrett Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 31 additions & 35 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16219,23 +16219,31 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
}
#endif

#if defined(__APPLE__) && defined(WOLFSSL_SYS_CA_CERTS)
/* If we can't validate the peer cert chain against the CAs
* loaded into wolfSSL, try to validate against the system
* certificates using Apple's native trust APIs BEFORE
* calling the verify callback so the callback sees the
* correct validation result */
if ((ret == WC_NO_ERR_TRACE(ASN_NO_SIGNER_E)) &&
(ssl->ctx->doAppleNativeCertValidationFlag)) {
if (DoAppleNativeCertValidation(ssl, args->certs,
args->totalCerts)) {
WOLFSSL_MSG("Apple native cert chain validation "
"SUCCESS");
ret = 0;
}
else {
WOLFSSL_MSG("Apple native cert chain validation "
"FAIL");
}
}
#endif /* defined(__APPLE__) && defined(WOLFSSL_SYS_CA_CERTS) */

/* Do verify callback. */
args->leafVerifyErr = ret =
DoVerifyCallback(SSL_CM(ssl), ssl, ret, args);

#if defined(__APPLE__) && defined(WOLFSSL_SYS_CA_CERTS)
/* Disregard failure to verify peer cert, as we will verify
* the whole chain with the native API later */
if (ssl->ctx->doAppleNativeCertValidationFlag) {
WOLFSSL_MSG("\tApple native CA validation override"
" available, will continue");
/* check if fatal error */
args->fatal = (args->verifyErr) ? 1 : 0;
if (args->fatal)
DoCertFatalAlert(ssl, ret);
}
else
#endif/*defined(__APPLE__)&& defined(WOLFSSL_SYS_CA_CERTS)*/
if (ret != 0) {
WOLFSSL_MSG("\tfatal cert error");
args->fatal = 1;
Expand Down Expand Up @@ -17004,23 +17012,6 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
}
#endif

#if defined(__APPLE__) && defined(WOLFSSL_SYS_CA_CERTS)
/* If we can't validate the peer cert chain against the CAs loaded
* into wolfSSL, try to validate against the system certificates
* using Apple's native trust APIs */
if ((ret == WC_NO_ERR_TRACE(ASN_NO_SIGNER_E)) &&
(ssl->ctx->doAppleNativeCertValidationFlag)) {
if (DoAppleNativeCertValidation(ssl, args->certs,
args->totalCerts)) {
WOLFSSL_MSG("Apple native cert chain validation SUCCESS");
ret = 0;
}
else {
WOLFSSL_MSG("Apple native cert chain validation FAIL");
}
}
#endif /* defined(__APPLE__) && defined(WOLFSSL_SYS_CA_CERTS) */

/* Do leaf verify callback when it wasn't called yet */
if (ret == 0 || ret != args->leafVerifyErr)
ret = DoVerifyCallback(SSL_CM(ssl), ssl, ret, args);
Expand Down Expand Up @@ -42037,12 +42028,17 @@ static int DoAppleNativeCertValidation(WOLFSSL* ssl,
kCFAllocatorDefault, (const char*)ssl->buffers.domainName.buffer,
kCFStringEncodingUTF8);
}
if (hostname != NULL) {
policy = SecPolicyCreateSSL(true, hostname);
}
else {
policy = SecPolicyCreateSSL(true, NULL);

/* If we're the client, we're validating the server's cert - use server
* policy (true). If we're the server, we're validating the client's cert -
* use client policy (false). Hostname validation only applies to server
* certs. */
{
int isServerCert = (ssl->options.side == WOLFSSL_CLIENT_END);
policy = SecPolicyCreateSSL(isServerCert,
isServerCert ? hostname : NULL);
}

status = SecTrustCreateWithCertificates(certArray, policy, &trust);
if (status != errSecSuccess) {
WOLFSSL_MSG_EX("Error creating trust object, "
Expand Down
Loading