setopt: fix to honor CURLOPT_PROXY_CAINFO_BLOB over Native CA#21631
Closed
vszakats wants to merge 1 commit into
Closed
setopt: fix to honor CURLOPT_PROXY_CAINFO_BLOB over Native CA#21631vszakats wants to merge 1 commit into
CURLOPT_PROXY_CAINFO_BLOB over Native CA#21631vszakats wants to merge 1 commit into
Conversation
In AppleSecTrust or NativeCA-enabled builds, make sure override it when setting a custom `CURLOPT_PROXY_CAINFO_BLOB`. Reported-by: Joshua Rogers (Aisle Research)
There was a problem hiding this comment.
Pull request overview
This PR fixes proxy TLS trust configuration so that when an application sets CURLOPT_PROXY_CAINFO_BLOB, it is treated as a custom CA source and therefore takes precedence over auto-enabled Native CA store behavior in AppleSecTrust / CURL_CA_NATIVE builds.
Changes:
- Mark
data->set.proxy_ssl.custom_cablobwhen handlingCURLOPT_PROXY_CAINFO_BLOB, mirroring the existing behavior forCURLOPT_CAINFO_BLOB. - Ensure Native CA auto-enable logic can correctly detect that a custom CA blob was provided for proxy TLS.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+2837
to
+2840
| if(Curl_ssl_supports(data, SSLSUPP_CAINFO_BLOB)) { | ||
| s->proxy_ssl.custom_cablob = TRUE; | ||
| return Curl_setblobopt(&s->blobs[BLOB_CAINFO_PROXY], blob); | ||
| } |
bagder
approved these changes
May 16, 2026
outcast36
pushed a commit
to greearb/curl
that referenced
this pull request
Jun 3, 2026
In AppleSecTrust or NativeCA-enabled builds, make sure override it when setting a custom `CURLOPT_PROXY_CAINFO_BLOB`. Reported-by: Joshua Rogers (Aisle Research) Follow-up to 1730407 curl#18279 Follow-up to eefd03c curl#18703 Closes curl#21631
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In AppleSecTrust or NativeCA-enabled builds, make sure override it when
setting a custom
CURLOPT_PROXY_CAINFO_BLOB.Reported-by: Joshua Rogers (Aisle Research)
Follow-up to 1730407 #18279
Follow-up to eefd03c #18703