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

Empty SNI names are not valid

Browse Source 
While empty inputs to SSL_set1_host() clear the reference identifier
list.

(cherry-picked from 1.1.0-dev)

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

4
crypto/x509/x509_vpm.c
View File

@ -94,11 +94,11 @@ static int int_x509_param_set_hosts(X509_VERIFY_PARAM_ID *id, int mode,
* Refuse names with embedded NUL bytes, except perhaps as final byte. * Refuse names with embedded NUL bytes, except perhaps as final byte.
* XXX: Do we need to push an error onto the error stack? * XXX: Do we need to push an error onto the error stack?
*/ */
if (namelen == 0) if (namelen == 0 || name == NULL)
namelen = name ? strlen(name) : 0; namelen = name ? strlen(name) : 0;
else if (name && memchr(name, '\0', namelen > 1 ? namelen - 1 : namelen)) else if (name && memchr(name, '\0', namelen > 1 ? namelen - 1 : namelen))
return 0; return 0;
if (name && name[namelen - 1] == '\0') if (namelen > 0 && name[namelen - 1] == '\0')
--namelen; --namelen;
if (mode == SET_HOST && id->hosts) { if (mode == SET_HOST && id->hosts) {

5
ssl/s3_lib.c
View File

@ -3263,6 +3263,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;
@ -3270,7 +3272,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;
} }