From d6c813daff48b5cffa8e4ae5e264e46c4d290083 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sun, 6 Apr 2008 15:42:29 +0000
Subject: [PATCH] Fix from HEAD.

---
 crypto/cms/cms_lib.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index 5b09e856c..fd0afa96f 100644
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c
@@ -481,8 +481,11 @@ int CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert)
 		if (cch->type == CMS_CERTCHOICE_CERT)
 			{
 			if (!X509_cmp(cch->d.certificate, cert))
-				return -1;
-				
+				{
+				CMSerr(CMS_F_CMS_ADD0_CERT, 
+					CMS_R_CERTIFICTATE_ALREADY_PRESENT);
+				return 0;
+				}
 			}
 		}
 	cch = CMS_add0_CertificateChoices(cms);