From 647a299bebdc530aabf1858c04167d60968e5cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sat, 25 Nov 2006 12:40:13 +0000
Subject: [PATCH] Sprinkle error strings.

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

diff --git a/lib/hx509/cms.c b/lib/hx509/cms.c
index d879be354..df7ca2614 100644
--- a/lib/hx509/cms.c
+++ b/lib/hx509/cms.c
@@ -723,13 +723,14 @@ hx509_cms_verify_signed(hx509_context context,
 		goto next_sigature;
 	    }
 
-	    ret = _hx509_verify_signature(NULL,
+	    ret = _hx509_verify_signature(context,
+					  NULL,
 					  &signer_info->digestAlgorithm,
 					  sd.encapContentInfo.eContent,
 					  &os);
 	    der_free_octet_string(&os);
 	    if (ret) {
-		hx509_set_error_string(context, 0, ret,
+		hx509_set_error_string(context, HX509_ERROR_APPEND, ret,
 				       "Failed to verify messageDigest");
 		goto next_sigature;
 	    }
@@ -799,13 +800,16 @@ hx509_cms_verify_signed(hx509_context context,
 	if (match_oid == &decode_oid)
 	    der_free_oid(&decode_oid);
 
-	if (ret == 0)
+	if (ret == 0) {
 	    ret = hx509_verify_signature(context,
 					 cert,
 					 &signer_info->signatureAlgorithm,
 					 signed_data,
 					 &signer_info->signature);
-
+	    if (ret)
+		hx509_set_error_string(context, HX509_ERROR_APPEND, ret,
+				       "Failed to verify sigature");
+	}
 	if (signed_data != sd.encapContentInfo.eContent) {
 	    der_free_octet_string(signed_data);
 	    free(signed_data);