generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Empty SNI names are not valid

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Viktor Dukhovni 2016-01-16 12:57:24 -05:00
parent 00cebd1131
commit e9a6c72e3c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/s3_lib.c
View File

@ -3221,6 +3221,8 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
#ifndef OPENSSL_NO_TLSEXT #ifndef OPENSSL_NO_TLSEXT
case SSL_CTRL_SET_TLSEXT_HOSTNAME: case SSL_CTRL_SET_TLSEXT_HOSTNAME:
if (larg == TLSEXT_NAMETYPE_host_name) { if (larg == TLSEXT_NAMETYPE_host_name) {
size_t len;
if (s->tlsext_hostname != NULL) if (s->tlsext_hostname != NULL)
OPENSSL_free(s->tlsext_hostname); OPENSSL_free(s->tlsext_hostname);
s->tlsext_hostname = NULL; s->tlsext_hostname = NULL;
@ -3228,7 +3230,8 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
ret = 1; ret = 1;
if (parg == NULL) if (parg == NULL)
break; break;
if (strlen((char *)parg) > TLSEXT_MAXLEN_host_name) { len = strlen((char *)parg);
if (len == 0 || len > TLSEXT_MAXLEN_host_name) {
SSLerr(SSL_F_SSL3_CTRL, SSL_R_SSL3_EXT_INVALID_SERVERNAME); SSLerr(SSL_F_SSL3_CTRL, SSL_R_SSL3_EXT_INVALID_SERVERNAME);
return 0; return 0;
} }