Unverified Commit 8a0daa17 authored by Ian Craggs's avatar Ian Craggs Committed by GitHub

Merge pull request #464 from ArcolaEnergy/ssl-verify-tweaks-4

Tweaks to ssl hostname verification
parents c897ebac b1a0199c
...@@ -691,11 +691,16 @@ int SSLSocket_connect(SSL* ssl, int sock, const char* hostname, int verify) ...@@ -691,11 +691,16 @@ int SSLSocket_connect(SSL* ssl, int sock, const char* hostname, int verify)
hostname_len = MQTTProtocol_addressPort(hostname, &port, NULL); hostname_len = MQTTProtocol_addressPort(hostname, &port, NULL);
rc = X509_check_host(cert, hostname, hostname_len, 0, &peername); rc = X509_check_host(cert, hostname, hostname_len, 0, &peername);
if (rc == 0)
rc = SOCKET_ERROR;
Log(TRACE_MIN, -1, "rc from X509_check_host is %d", rc); Log(TRACE_MIN, -1, "rc from X509_check_host is %d", rc);
Log(TRACE_MIN, -1, "peername from X509_check_host is %s", peername); Log(TRACE_MIN, -1, "peername from X509_check_host is %s", peername);
if (peername != NULL)
OPENSSL_free(peername);
// 0 == fail, -1 == SSL internal error
if (rc == 0 || rc == -1)
rc = SSL_FATAL;
if (cert) if (cert)
X509_free(cert); X509_free(cert);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment