From 01dad85177bb5097ec4010054ae884ade3f14109 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 7 Dec 2006 16:11:57 +0000
Subject: [PATCH] Print more of the SAN's, esp id-pkinit-san.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19266 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hx509/print.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/lib/hx509/print.c b/lib/hx509/print.c
index 831a9d1ad..d52980f85 100644
--- a/lib/hx509/print.c
+++ b/lib/hx509/print.c
@@ -226,11 +226,64 @@ check_altName(hx509_validate_ctx ctx,
     }
 
     for (i = 0; i < gn.len; i++) {
-	if (gn.val[i].element == choice_GeneralName_otherName) {
+	switch (gn.val[i].element) {
+	case choice_GeneralName_otherName:
 	    validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "other name oid: ");
 	    hx509_oid_print(&gn.val[i].u.otherName.type_id,
 			    validate_vprint, ctx);
+	    if (der_heim_oid_cmp(&gn.val[i].u.otherName.type_id,
+				 oid_id_pkinit_san()) == 0)
+	    {
+		KRB5PrincipalName kn;
+		unsigned j;
+		size_t size;
+
+		validate_print(ctx, HX509_VALIDATE_F_VERBOSE, " pk-init: ");
+
+		ret = decode_KRB5PrincipalName(gn.val[i].u.otherName.value.data, 
+					       gn.val[i].u.otherName.value.length,
+					       &kn, &size);
+		if (ret) {
+		    printf("Decoding kerberos name in SAN failed: %d", ret);
+		    return 1;
+		}
+
+		if (size != gn.val[i].u.otherName.value.length) {
+		    printf("Decoding kerberos name have extra bits on the end");
+		    return 1;
+		}
+
+		for (j = 0; j < kn.principalName.name_string.len; j++) {
+		    validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "%s", 
+				   kn.principalName.name_string.val[j]);
+		    if (j + 1 < kn.principalName.name_string.len)
+			validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "/");
+		}
+		validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "@");
+		validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "%s", kn.realm);
+
+		free_KRB5PrincipalName(&kn);
+	    }
 	    validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "\n");
+	    break;
+	case choice_GeneralName_rfc822Name:
+	    validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "rfc822Name\n");
+	    break;
+	case choice_GeneralName_dNSName:
+	    validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "dnsName\n");
+	    break;
+	case choice_GeneralName_directoryName:
+	    validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "directoryName\n");
+	    break;
+	case choice_GeneralName_uniformResourceIdentifier:
+	    validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "uri\n");
+	    break;
+	case choice_GeneralName_iPAddress:
+	    validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "ip address\n");
+	    break;
+	case choice_GeneralName_registeredID:
+	    validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "registered id\n");
+	    break;
 	}
     }