INT-6557: Allow wildcard pjproject TLS certs#11
Merged
MattMacGregor merged 1 commit intointercom/release-2-13from Nov 5, 2025
Merged
Conversation
MattMacGregor
changed the base branch from
pjsip/release-2-13
to
intercom/release-2-13
MattMacGregor
force-pushed
the
mattmacgregor/INT-6557---allow-wildcard-pjproject
branch
from
0465c8b to
83e5545
Compare
MattMacGregor
commented
Oct 28, 2025
pjsip/src/pjsip/sip_transport_tls.c
Outdated
Comment on lines
+1928
to
+1942
| if (cert_name->slen > 2 && cert_name->ptr[0] == '*' && cert_name->ptr[1] == '.') { | ||
| if (!wildcard_adjusted_remote_set) { | ||
| wildcard_adjusted_remote = *remote_name; | ||
| remove_first_subdomain(&wildcard_adjusted_remote); | ||
| wildcard_adjusted_remote_set = PJ_TRUE; | ||
| } | ||
| pj_str_t wildcard_adjusted_cert_name = *cert_name; | ||
| wildcard_adjusted_cert_name.ptr += 2; | ||
| wildcard_adjusted_cert_name.slen -= 2; | ||
|
|
||
| matched = !pj_stricmp(&wildcard_adjusted_remote, &wildcard_adjusted_cert_name); | ||
| } else { | ||
| matched = !pj_stricmp(remote_name, cert_name); | ||
| } | ||
| break; |
Author
There was a problem hiding this comment.
If it starts with *., remove the first subdomain of the remote name. This *. can only match one subdomain. We also are only considering if the cert name and remote name are both longer than 2, so *. and * in the cert we are not considering as valid (neither should happen ever, technically not sure if they are considered valid by the spec but I imagine not).
MattMacGregor
commented
Oct 28, 2025
pjsip/src/pjsip/sip_transport_tls.c
Outdated
Comment on lines
+1929
to
+1933
| if (!wildcard_adjusted_remote_set) { | ||
| wildcard_adjusted_remote = *remote_name; | ||
| remove_first_subdomain(&wildcard_adjusted_remote); | ||
| wildcard_adjusted_remote_set = PJ_TRUE; | ||
| } |
Author
There was a problem hiding this comment.
might as well optimize to only do this once.
MattMacGregor
commented
Oct 28, 2025
pjsip/src/pjsip/sip_transport_tls.c
Outdated
Comment on lines
+1968
to
+1981
| if (serv_cert->subject.cn.slen > 2 && serv_cert->subject.cn.ptr[0] == '*' && serv_cert->subject.cn.ptr[1] == '.') { | ||
| if (!wildcard_adjusted_remote_set) { | ||
| wildcard_adjusted_remote = *remote_name; | ||
| remove_first_subdomain(&wildcard_adjusted_remote); | ||
| wildcard_adjusted_remote_set = PJ_TRUE; | ||
| } | ||
| pj_str_t wildcard_adjusted_cn = serv_cert->subject.cn; | ||
| wildcard_adjusted_cn.ptr += 2; | ||
| wildcard_adjusted_cn.slen -= 2; | ||
|
|
||
| matched = !pj_stricmp(&wildcard_adjusted_remote, &wildcard_adjusted_cn); | ||
| } else { | ||
| matched = !pj_stricmp(remote_name, &serv_cert->subject.cn); | ||
| } |
Author
There was a problem hiding this comment.
Repeat the same logic for the CN.
|
Semgrep found 1 Don't call |
ecolsen7
approved these changes
Nov 3, 2025
MattMacGregor
force-pushed
the
mattmacgregor/INT-6557---allow-wildcard-pjproject
branch
from
8a4d796 to
6c6a889
Compare
MattMacGregor
force-pushed
the
mattmacgregor/INT-6557---allow-wildcard-pjproject
branch
from
6c6a889 to
5b3664f
Compare
darshan-verkada
approved these changes
Nov 5, 2025
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
3 participants
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.
Twilio uses a wildcard TLS cert. If we want to use TLS with them and properly verify their cert, we need to allow these certs, despite them technically not being allowed by the SIP RFC.
Regardless, its better than not verifying the cert as a whole, which is the other option since we are stuck with Twilio as a primary SIP provider.