Commit 4d6fe78f authored by Viktor Dukhovni's avatar Viktor Dukhovni
Browse files

Empty SNI names are not valid 



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

(cherry-picked from 1.1.0-dev)

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 15debc12

crypto/x509/x509_vpm.c

+2 −2
Original line number Diff line number Diff line
@@ -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.

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

    else if (name && memchr(name, '\0', namelen > 1 ? namelen - 1 : namelen))

        return 0;

    if (name && name[namelen - 1] == '\0')

    if (namelen > 0 && name[namelen - 1] == '\0')

        --namelen;



    if (mode == SET_HOST && id->hosts) {

ssl/s3_lib.c

+4 −1
Original line number Diff line number Diff line
@@ -3263,6 +3263,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;
@@ -3270,7 +3272,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;

            }