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

Merge pull request from RichardSteele/fix-sni-231

Browse Source 
Fix : SNI breaks STARTTLS
This commit is contained in:
Vincent Richard 2019-11-18 21:26:19 +01:00 committed by GitHub
commit 8ac5b7f5fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions

5
src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.cpp

@ -94,8 +94,6 @@ void TLSSocket_GnuTLS::connect(const string& address, const port_t port) {
try { try {
gnutls_server_name_set(*m_session->m_gnutlsSession, GNUTLS_NAME_DNS, address.c_str(), address.size());
m_wrapped->connect(address, port); m_wrapped->connect(address, port);
handshake(); handshake();
@ -319,6 +317,9 @@ void TLSSocket_GnuTLS::handshake() {
// Start handshaking process // Start handshaking process
try { try {
string peerName = getPeerName();
gnutls_server_name_set(*m_session->m_gnutlsSession, GNUTLS_NAME_DNS, peerName.c_str(), peerName.size());
while (true) { while (true) {

10
src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp

@ -122,8 +122,9 @@ TLSSocket_OpenSSL::~TLSSocket_OpenSSL() {
void TLSSocket_OpenSSL::createSSLHandle() { void TLSSocket_OpenSSL::createSSLHandle() {
if (m_wrapped->isConnected()) { if (m_wrapped->isConnected()) {
string peerName = getPeerName();
if (m_address.empty()) {
if (peerName.empty()) {
throw exceptions::tls_exception("Unknown host name, will not be able to set SNI"); throw exceptions::tls_exception("Unknown host name, will not be able to set SNI");
} }
@ -167,7 +168,7 @@ void TLSSocket_OpenSSL::createSSLHandle() {
} }
SSL_set_bio(m_ssl, sockBio, sockBio); SSL_set_bio(m_ssl, sockBio, sockBio);
SSL_set_tlsext_host_name(m_ssl, m_address.c_str()); SSL_set_tlsext_host_name(m_ssl, peerName.c_str());
SSL_set_connect_state(m_ssl); 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); SSL_set_mode(m_ssl, SSL_MODE_AUTO_RETRY | SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
@ -183,8 +184,7 @@ void TLSSocket_OpenSSL::connect(const string& address, const port_t port) {
try { try {
m_wrapped->connect(address, port); m_wrapped->connect(address, port);
m_address = address;
createSSLHandle(); createSSLHandle();
handshake(); handshake();

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

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