Skip to content

Enable SNI (Server Name Indication) in cfstream for imap and smtp #9

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

Open
Zhixin-Lu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable SNI (Server Name Indication) in cfstream for imap and smtp #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7132716
Enable SNI (Server Name Indication) in cfstream for imap and smtp
Zhixin-Lu Aug 18, 2022
badbdd6
Remove debug codes
Zhixin-Lu Aug 18, 2022
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
7 changes: 7 additions & 0 deletions src/data-types/mailstream_cfstream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,13 @@ int mailstream_cfstream_set_ssl_enabled(mailstream * s, int ssl_enabled)
CFDictionarySetValue(settings, kCFStreamSSLValidatesCertificateChain, kCFBooleanFalse);
}

// enable SNI (Server Name Indication)
if (cfstream_data->ssl_peer_name && cfstream_data->ssl_peer_name[0] != 0) {
CFStringRef ssl_peer_name = CFStringCreateWithCString(NULL, cfstream_data->ssl_peer_name, kCFStringEncodingUTF8);
CFDictionarySetValue(settings, kCFStreamSSLPeerName, ssl_peer_name);
CFRelease(ssl_peer_name);
}

CFReadStreamSetProperty(cfstream_data->readStream, kCFStreamPropertySSLSettings, settings);
CFWriteStreamSetProperty(cfstream_data->writeStream, kCFStreamPropertySSLSettings, settings);
CFRelease(settings);
Expand Down
1 change: 1 addition & 0 deletions src/low-level/imap/mailimap_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ static int mailimap_cfssl_connect_voip_ssl_level(mailimap * f, const char * serv
}
mailstream_cfstream_set_ssl_level(stream, ssl_level);
mailstream_cfstream_set_ssl_verification_mask(stream, MAILSTREAM_CFSTREAM_SSL_NO_VERIFICATION);
mailstream_cfstream_set_ssl_peer_name(stream, server); // for SNI (Server Name Indication)
r = mailstream_cfstream_set_ssl_enabled(stream, 1);
if (r < 0) {
mailstream_close(stream);
Expand Down
1 change: 1 addition & 0 deletions src/low-level/smtp/mailsmtp_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ static int mailsmtp_cfssl_connect_ssl_level(mailsmtp * session,
}
mailstream_cfstream_set_ssl_level(stream, ssl_level);
mailstream_cfstream_set_ssl_verification_mask(stream, MAILSTREAM_CFSTREAM_SSL_NO_VERIFICATION);
mailstream_cfstream_set_ssl_peer_name(stream, server); // for SNI (Server Name Indication)
r = mailstream_cfstream_set_ssl_enabled(stream, 1);
if (r < 0) {
mailstream_close(stream);
Expand Down