From 94d63f509243bf69a899fbcb23691fa8b9f64bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 23 Nov 2006 18:08:23 +0000
Subject: [PATCH] (hx509_cms_create_signed_1): provide a best effort path to
 the trust anchors to be stored in the SignedData packet, if find parents
 until trust anchor or max length.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19094 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hx509/cms.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/hx509/cms.c b/lib/hx509/cms.c
index c4d973c38..d879be354 100644
--- a/lib/hx509/cms.c
+++ b/lib/hx509/cms.c
@@ -936,7 +936,7 @@ hx509_cms_create_signed_1(hx509_context context,
 			  const void *data, size_t length,
 			  const AlgorithmIdentifier *digest_alg,
 			  hx509_cert cert,
-			  hx509_certs trust_anchors,
+			  hx509_certs anchors,
 			  hx509_certs pool,
 			  heim_octet_string *signed_data)
 {
@@ -1125,21 +1125,18 @@ hx509_cms_create_signed_1(hx509_context context,
 	goto out;
     }
 
-    if (trust_anchors) {
-	ret = _hx509_calculate_path(context,
-				    trust_anchors,
-				    0,
-				    cert,
-				    pool,
-				    &path);
-	if (ret) {
-	    _hx509_path_free(&path);
-	    ret = _hx509_path_append(context, &path, cert);
-	}
+    /*
+     * Provide best effort path
+     */
+    if (pool) {
+	_hx509_calculate_path(context,
+			      anchors,
+			      0,
+			      cert,
+			      pool,
+			      &path);
     } else
-	ret = _hx509_path_append(context, &path, cert);
-    if (ret)
-	goto out;
+	_hx509_path_append(context, &path, cert);
 
 
     if (path.len) {