GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #226 from 0xd34df00d/master

Browse Source 
Added support for SNI.
This commit is contained in:
Vincent Richard 2019-10-14 08:51:35 +02:00 committed by GitHub
commit 19fb3c2491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.cpp
View File

@ -94,6 +94,8 @@ void TLSSocket_GnuTLS::connect(const string& address, const port_t port) {
try {
gnutls_server_name_set(*m_session->m_gnutlsSession, GNUTLS_NAME_DNS, address.c_str(), address.size());
m_wrapped->connect(address, port);
handshake();

6
src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp
View File

@ -123,6 +123,10 @@ void TLSSocket_OpenSSL::createSSLHandle() {
if (m_wrapped->isConnected()) {
if (m_address.empty()) {
throw exceptions::tls_exception("Unknown host name, will not be able to set SNI");
}
#if OPENSSL_VERSION_NUMBER < 0x10100000L
BIO* sockBio = BIO_new(&sm_customBIOMethod);
@ -163,6 +167,7 @@ void TLSSocket_OpenSSL::createSSLHandle() {
}
SSL_set_bio(m_ssl, sockBio, sockBio);
SSL_set_tlsext_host_name(m_ssl, m_address.c_str());
SSL_set_connect_state(m_ssl);
SSL_set_mode(m_ssl, SSL_MODE_AUTO_RETRY | SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
@ -178,6 +183,7 @@ void TLSSocket_OpenSSL::connect(const string& address, const port_t port) {
try {
m_wrapped->connect(address, port);
m_address = address;
createSSLHandle();

2
src/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp
View File

@ -116,6 +116,8 @@ private:
shared_ptr <socket> m_wrapped;
std::string m_address;
bool m_connected;
byte_t m_buffer[65536];