Commit e9a6c72e authored by Viktor Dukhovni's avatar Viktor Dukhovni
Browse files

Empty SNI names are not valid 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 00cebd11

ssl/s3_lib.c

+4 −1
Original line number Diff line number Diff line
@@ -3221,6 +3221,8 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) 
#ifndef OPENSSL_NO_TLSEXT

    case SSL_CTRL_SET_TLSEXT_HOSTNAME:

        if (larg == TLSEXT_NAMETYPE_host_name) {

            size_t len;



            if (s->tlsext_hostname != NULL)

                OPENSSL_free(s->tlsext_hostname);

            s->tlsext_hostname = NULL;
@@ -3228,7 +3230,8 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) 
            ret = 1;

            if (parg == NULL)

                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);

                return 0;

            }