Changeset 5eab9260

Timestamp:

2018-09-09T22:04:41Z (6 years ago)

Author:

Christopher Brannon <chris@…>

Branches:

master

Children:

67f4cfe

Parents:

37437f2

git-author:

Christopher Brannon <chris@…> (09-09-18 21:45:10)

git-committer:

Christopher Brannon <chris@…> (09-09-18 22:04:41)

Message:

SSL: correctly handle hostnames starting with a digit when SNI is needed.

I noticed that I was unable to connect to a host with bitlbee.
Tracking it down, I found that the problem was that the host needed SNI
but bitlbee wasn't trying to use it. The hostname started with a digit,
so bitlbee was assuming that it was an IP address.

Location:

lib

Files:

• ssl_gnutls.c (modified) (1 diff)
• ssl_openssl.c (modified) (1 diff)

lib/ssl_gnutls.c

@@ -323 +323 @@
         gnutls_set_default_priority(conn->session);
         gnutls_credentials_set(conn->session, GNUTLS_CRD_CERTIFICATE, xcred);
-        if (conn->hostname && !g_ascii_isdigit(conn->hostname[0])) {
+        if (conn->hostname && !g_hostname_is_ip_address(conn->hostname)) {
                 gnutls_server_name_set(conn->session, GNUTLS_NAME_DNS,
                                        conn->hostname, strlen(conn->hostname));

lib/ssl_openssl.c

@@ -167 +167 @@
         SSL_set_fd(conn->ssl, conn->fd);
 
-        if (conn->hostname && !g_ascii_isdigit(conn->hostname[0])) {
+        if (conn->hostname && !g_hostname_is_ip_address(conn->hostname)) {
                 SSL_set_tlsext_host_name(conn->ssl, conn->hostname);
         }