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

Reject empty generation strings.

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

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 111b60bea0)
This commit is contained in:
Dr. Stephen Henson
2015-04-16 00:21:05 +01:00
parent 5101c35c91
commit a696708ae6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/asn1/asn1_gen.c
View File

@@ -152,8 +152,10 @@ ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf)
asn1_tags.imp_class = -1; asn1_tags.imp_class = -1;
asn1_tags.format = ASN1_GEN_FORMAT_ASCII; asn1_tags.format = ASN1_GEN_FORMAT_ASCII;
asn1_tags.exp_count = 0; 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; return NULL;
}
if ((asn1_tags.utype == V_ASN1_SEQUENCE) if ((asn1_tags.utype == V_ASN1_SEQUENCE)
|| (asn1_tags.utype == V_ASN1_SET)) { || (asn1_tags.utype == V_ASN1_SET)) {
@@ -280,7 +282,7 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
int tmp_tag, tmp_class; int tmp_tag, tmp_class;
if (elem == NULL) if (elem == NULL)
return 0; return -1;
for (i = 0, p = elem; i < len; p++, i++) { for (i = 0, p = elem; i < len; p++, i++) {
/* Look for the ':' in name value pairs */ /* Look for the ':' in name value pairs */