From 230580d21cf9a8af06b3b2bbb4a806bc41b73079 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Wed, 10 Mar 2021 15:59:38 -0600
Subject: [PATCH] hx509: Fix rfc2459.asn1 compilation w/o templates

---
 lib/hx509/ca.c    | 91 ++++++++++++-----------------------------------
 lib/hx509/print.c | 12 +------
 2 files changed, 24 insertions(+), 79 deletions(-)

diff --git a/lib/hx509/ca.c b/lib/hx509/ca.c
index b9d9b1716..4e8ab18ba 100644
--- a/lib/hx509/ca.c
+++ b/lib/hx509/ca.c
@@ -672,88 +672,43 @@ hx509_ca_tbs_add_crl_dp_uri(hx509_context context,
 			    const char *uri,
 			    hx509_name issuername)
 {
+    DistributionPointName dpn;
     DistributionPoint dp;
+    GeneralNames crlissuer;
+    GeneralName gn, ign;
+    Name in;
     int ret;
 
     memset(&dp, 0, sizeof(dp));
-
-    dp.distributionPoint = ecalloc(1, sizeof(*dp.distributionPoint));
-
-    {
-	DistributionPointName name;
-	GeneralName gn;
-	size_t size;
-
-	name.element = choice_DistributionPointName_fullName;
-	name.u.fullName.len = 1;
-	name.u.fullName.val = &gn;
-
-	gn.element = choice_GeneralName_uniformResourceIdentifier;
-	gn.u.uniformResourceIdentifier.data = rk_UNCONST(uri);
-	gn.u.uniformResourceIdentifier.length = strlen(uri);
-
-	ASN1_MALLOC_ENCODE(DistributionPointName,
-			   dp.distributionPoint->data,
-			   dp.distributionPoint->length,
-			   &name, &size, ret);
-	if (ret) {
-	    hx509_set_error_string(context, 0, ret,
-				   "Failed to encoded DistributionPointName");
-	    goto out;
-	}
-	if (dp.distributionPoint->length != size)
-	    _hx509_abort("internal ASN.1 encoder error");
-    }
+    memset(&gn, 0, sizeof(gn));
+    memset(&ign, 0, sizeof(ign));
+    memset(&in, 0, sizeof(in));
+    gn.element = choice_GeneralName_uniformResourceIdentifier;
+    gn.u.uniformResourceIdentifier.data = rk_UNCONST(uri);
+    gn.u.uniformResourceIdentifier.length = strlen(uri);
+    dpn.element = choice_DistributionPointName_fullName;
+    dpn.u.fullName.len = 1;
+    dpn.u.fullName.val = &gn;
+    dp.distributionPoint = &dpn;
 
     if (issuername) {
-#if 1
-	/**
-	 * issuername not supported
-	 */
-	hx509_set_error_string(context, 0, EINVAL,
-			       "CRLDistributionPoints.name.issuername not yet supported");
-	return EINVAL;
-#else
-	GeneralNames *crlissuer;
-	GeneralName gn;
-	Name n;
-
-	crlissuer = calloc(1, sizeof(*crlissuer));
-	if (crlissuer == NULL) {
-	    return ENOMEM;
-	}
-	memset(&gn, 0, sizeof(gn));
-
-	gn.element = choice_GeneralName_directoryName;
-	ret = hx509_name_to_Name(issuername, &n);
+	ign.element = choice_GeneralName_directoryName;
+	ret = hx509_name_to_Name(issuername, &ign.u.directoryName);
 	if (ret) {
 	    hx509_set_error_string(context, 0, ret, "out of memory");
-	    goto out;
+	    return ret;
 	}
-
-	gn.u.directoryName.element = n.element;
-	gn.u.directoryName.u.rdnSequence = n.u.rdnSequence;
-
-	ret = add_GeneralNames(&crlissuer, &gn);
-	free_Name(&n);
-	if (ret) {
-	    hx509_set_error_string(context, 0, ret, "out of memory");
-	    goto out;
-	}
-
+        crlissuer.len = 1;
+        crlissuer.val = &ign;
 	dp.cRLIssuer = &crlissuer;
-#endif
     }
 
     ret = add_CRLDistributionPoints(&tbs->crldp, &dp);
-    if (ret) {
+    if (issuername)
+        free_Name(&ign.u.directoryName);
+
+    if (ret)
 	hx509_set_error_string(context, 0, ret, "out of memory");
-	goto out;
-    }
-
-out:
-    free_DistributionPoint(&dp);
-
     return ret;
 }
 
diff --git a/lib/hx509/print.c b/lib/hx509/print.c
index 065ee33aa..386f1cc33 100644
--- a/lib/hx509/print.c
+++ b/lib/hx509/print.c
@@ -439,18 +439,9 @@ check_CRLDistributionPoints(hx509_validate_ctx ctx,
     validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "CRL Distribution Points:\n");
     for (i = 0 ; i < dp.len; i++) {
 	if (dp.val[i].distributionPoint) {
-	    DistributionPointName dpname;
-	    heim_any *data = dp.val[i].distributionPoint;
+	    DistributionPointName dpname = dp.val[i].distributionPoint[0];
 	    size_t j;
 
-	    ret = decode_DistributionPointName(data->data, data->length,
-					       &dpname, NULL);
-	    if (ret) {
-		validate_print(ctx, HX509_VALIDATE_F_VALIDATE,
-			       "Failed to parse CRL Distribution Point Name: %d\n", ret);
-		continue;
-	    }
-
 	    switch (dpname.element) {
 	    case choice_DistributionPointName_fullName:
 		validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "Fullname:\n");
@@ -480,7 +471,6 @@ check_CRLDistributionPoints(hx509_validate_ctx ctx,
 			       "Unknown DistributionPointName");
 		break;
 	    }
-	    free_DistributionPointName(&dpname);
 	}
     }
     free_CRLDistributionPoints(&dp);