From 75baeb9f35719f642635843a059a137db74ac573 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 23 Jun 2026 09:49:26 +0200 Subject: [PATCH] constraints: Fallback to binary OIDs in log messages Similar to the previous commit. --- .../constraints/constraints_validator.c | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/libstrongswan/plugins/constraints/constraints_validator.c b/src/libstrongswan/plugins/constraints/constraints_validator.c index 1f55d115b..93ee611f2 100644 --- a/src/libstrongswan/plugins/constraints/constraints_validator.c +++ b/src/libstrongswan/plugins/constraints/constraints_validator.c @@ -697,9 +697,18 @@ static bool check_policy(x509_t *subject, x509_t *issuer) if (!has_policy(issuer, mapping->issuer)) { oid = asn1_oid_to_string(mapping->issuer); - DBG1(DBG_CFG, "certificate '%Y' maps policy from %s, but issuer " - "misses it", cert->get_subject(cert), oid); - free(oid); + if (oid) + { + DBG1(DBG_CFG, "certificate '%Y' maps policy from %s, but " + "issuer misses it", cert->get_subject(cert), oid); + free(oid); + } + else + { + DBG1(DBG_CFG, "certificate '%Y' maps policy from %#B, but " + "issuer misses it", cert->get_subject(cert), + &mapping->issuer); + } enumerator->destroy(enumerator); return FALSE; } @@ -712,9 +721,17 @@ static bool check_policy(x509_t *subject, x509_t *issuer) if (!has_policy(issuer, policy->oid)) { oid = asn1_oid_to_string(policy->oid); - DBG1(DBG_CFG, "policy %s missing in issuing certificate '%Y'", - oid, cert->get_issuer(cert)); - free(oid); + if (oid) + { + DBG1(DBG_CFG, "policy %s missing in issuing certificate '%Y'", + oid, cert->get_issuer(cert)); + free(oid); + } + else + { + DBG1(DBG_CFG, "policy %#B missing in issuing certificate '%Y'", + &policy->oid, cert->get_issuer(cert)); + } enumerator->destroy(enumerator); return FALSE; }