mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-23 18:33:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleaner handling of "cnid" in do_x509_check

Browse Source 
Avoid using cnid = 0, use NID_undef instead, and return early instead
of trying to find an instance of that in the subject DN.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Viktor Dukhovni 2015-09-01 21:59:08 -04:00
parent a0724ef1c9
commit fffc2faeb2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/x509v3/v3_utl.c
View File

@ -921,7 +921,7 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
GENERAL_NAMES *gens = NULL;
X509_NAME *name = NULL;
int i;
int cnid;
int cnid = NID_undef;
int alt_type;
int san_present = 0;
int rv = 0;
@ -944,7 +944,6 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
else
equal = equal_wildcard;
} else {
cnid = 0;
alt_type = V_ASN1_OCTET_STRING;
equal = equal_case;
}
@ -975,11 +974,16 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
GENERAL_NAMES_free(gens);
if (rv != 0)
return rv;
if (!cnid
if (cnid == NID_undef
|| (san_present
&& !(flags & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT)))
return 0;
}
/* We're done if CN-ID is not pertinent */
if (cnid == NID_undef)
return 0;
i = -1;
name = X509_get_subject_name(x);
while ((i = X509_NAME_get_index_by_NID(name, cnid, i)) >= 0) {