From: Maks Mishin Date: Wed, 2 Oct 2024 04:29:04 +0000 (+0300) Subject: v3_ncons: Fix difference args names in nc_match_single function X-Git-Tag: openssl-3.5.0-alpha1~1053 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f48629c9d791c9105f2d68f4a4d0b0085e8e0ca;p=thirdparty%2Fopenssl.git v3_ncons: Fix difference args names in nc_match_single function The arguments of the `nc_match_single` function have different names in the declaration and definition or are mixed up in places. CLA: trivial Reviewed-by: Paul Dale Reviewed-by: Tom Cosgrove Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/25592) --- diff --git a/crypto/x509/v3_ncons.c b/crypto/x509/v3_ncons.c index 481e1e20440..c6ebb2f6e1a 100644 --- a/crypto/x509/v3_ncons.c +++ b/crypto/x509/v3_ncons.c @@ -34,8 +34,8 @@ static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method, static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip); static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc); -static int nc_match_single(int effective_type, GENERAL_NAME *sub, - GENERAL_NAME *gen); +static int nc_match_single(int effective_type, GENERAL_NAME *gen, + GENERAL_NAME *base); static int nc_dn(const X509_NAME *sub, const X509_NAME *nm); static int nc_dns(ASN1_IA5STRING *sub, ASN1_IA5STRING *dns); static int nc_email(ASN1_IA5STRING *sub, ASN1_IA5STRING *eml);