Commit 3e41defe authored by Tomas Mraz's avatar Tomas Mraz Committed by Rich Salz
Browse files

Avoid only exact duplicates when creating the accepted CA names list 



This avoids situations where third party client is unable to recognize
that the client certificate was issued by the same CA with name differring
only by case or insignificant characters.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4731)
parent c81c38cb

ssl/ssl_cert.c

+23 −4
Original line number Original line Diff line number Diff line
@@ -566,14 +566,33 @@ int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x) 
    return add_ca_name(&ctx->ca_names, x);

    return add_ca_name(&ctx->ca_names, x);

}

}





static int xname_sk_cmp(const X509_NAME *const *a, const X509_NAME *const *b)

static int xname_cmp(const X509_NAME *a, const X509_NAME *b)

{

{

    return X509_NAME_cmp(*a, *b);

    unsigned char *abuf = NULL, *bbuf = NULL;

    int alen, blen, ret;



    /* X509_NAME_cmp() itself casts away constness in this way, so

     * assume it's safe:

     */

    alen = i2d_X509_NAME((X509_NAME *)a, &abuf);

    blen = i2d_X509_NAME((X509_NAME *)b, &bbuf);



    if (alen < 0 || blen < 0)

        ret = -2;

    else if (alen != blen)

        ret = alen - blen;

    else /* alen == blen */

        ret = memcmp(abuf, bbuf, alen);



    OPENSSL_free(abuf);

    OPENSSL_free(bbuf);



    return ret;

}

}





static int xname_cmp(const X509_NAME *a, const X509_NAME *b)

static int xname_sk_cmp(const X509_NAME *const *a, const X509_NAME *const *b)

{

{

    return X509_NAME_cmp(a, b);

    return xname_cmp(*a, *b);

}

}





static unsigned long xname_hash(const X509_NAME *a)

static unsigned long xname_hash(const X509_NAME *a)