mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 13:10:57 -08:00
Code Issues Projects Releases Wiki Activity

Only send SNI if the host name is not an IP address

Browse source 
* gnutls.c (gnutls_ip_address_p): New function.
(Fgnutls_boot): Only send SNI if the host name is not an IP address.
This commit is contained in:
Lars Magne Ingebrigtsen 2014-11-26 23:11:57 +01:00
parent ccae04f205
commit fc4d2c7784
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-11-26 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnutls.c (gnutls_ip_address_p): New function.
(Fgnutls_boot): Only send SNI if the host name is not an IP address.
2014-11-26 Toke Høiland-Jørgensen <toke@toke.dk> (tiny change)
* gnutls.c (Fgnutls_boot): Send the server name over (bug#18208).

23
src/gnutls.c
View file

@ -1095,6 +1095,18 @@ emacs_gnutls_global_init (void)
return gnutls_make_error (ret);
}
static bool
gnutls_ip_address_p (char *string)
{
char c;
while ((c = *string++) != 0)
if (! ((c == '.' || c == ':' || (c >= '0' && c <= '9'))))
return false;
return true;
}
#if 0
/* Deinitializes global GnuTLS state.
See also `gnutls-global-init'. */
@ -1418,10 +1430,13 @@ one trustfile (usually a CA bundle). */)
if (ret < GNUTLS_E_SUCCESS)
return gnutls_make_error (ret);
ret = fn_gnutls_server_name_set (state, GNUTLS_NAME_DNS, c_hostname,
strlen(c_hostname));
if (ret < GNUTLS_E_SUCCESS)
return gnutls_make_error (ret);
if (!gnutls_ip_address_p (c_hostname))
{
ret = fn_gnutls_server_name_set (state, GNUTLS_NAME_DNS, c_hostname,
strlen (c_hostname));
if (ret < GNUTLS_E_SUCCESS)
return gnutls_make_error (ret);
}
GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_SET;
ret = emacs_gnutls_handshake (XPROCESS (proc));