Commit 21220998 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Reject empty generation strings. 



Reported by Hanno Böck <hanno@hboeck.de>

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit 111b60be)

Conflicts:
	crypto/asn1/asn1_gen.c
parent 4bbff0f9

crypto/asn1/asn1_gen.c

+6 −1
Original line number Diff line number Diff line
@@ -152,8 +152,10 @@ ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf) 
    asn1_tags.imp_class = -1;

    asn1_tags.format = ASN1_GEN_FORMAT_ASCII;

    asn1_tags.exp_count = 0;

    if (CONF_parse_list(str, ',', 1, asn1_cb, &asn1_tags) != 0)

    if (CONF_parse_list(str, ',', 1, asn1_cb, &asn1_tags) != 0) {

        *perr = ASN1_R_UNKNOWN_TAG;

        return NULL;

    }



    if ((asn1_tags.utype == V_ASN1_SEQUENCE)

        || (asn1_tags.utype == V_ASN1_SET)) {
@@ -279,6 +281,9 @@ static int asn1_cb(const char *elem, int len, void *bitstr) 


    int tmp_tag, tmp_class;



    if (elem == NULL)

        return -1;



    for (i = 0, p = elem; i < len; p++, i++) {

        /* Look for the ':' in name value pairs */

        if (*p == ':') {