From: Stef Walter <stefw@redhat.com>
Date: Fri, 8 Aug 2014 06:47:23 +0000 (+0200)
Subject: trust: Print label of certificate when complaining about basic constraints
X-Git-Tag: 0.21.2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1576ac9495333d0f285e0ab69f444d3ae0630859;p=p11-kit

trust: Print label of certificate when complaining about basic constraints

https://bugs.freedesktop.org/show_bug.cgi?id=82328
---

diff --git a/trust/builder.c b/trust/builder.c
index 18c09ad..f7ea86a 100644
--- a/trust/builder.c
+++ b/trust/builder.c
@@ -551,6 +551,7 @@ calc_certificate_category (p11_builder *builder,
                            CK_ATTRIBUTE *public_key,
                            CK_ULONG *category)
 {
+	CK_ATTRIBUTE *label;
 	unsigned char *ext;
 	size_t ext_len;
 	bool is_ca = 0;
@@ -570,7 +571,10 @@ calc_certificate_category (p11_builder *builder,
 		ret = p11_x509_parse_basic_constraints (builder->asn1_defs, ext, ext_len, &is_ca);
 		free (ext);
 		if (!ret) {
-			p11_message ("invalid basic constraints certificate extension");
+			label = p11_attrs_find_valid (cert, CKA_LABEL);
+			p11_message ("%.*s: invalid basic constraints certificate extension",
+				     label ? (int)label->ulValueLen : 7,
+				     label ? (char *)label->pValue : "unknown");
 			return false;
 		}