summaryrefslogtreecommitdiffstats
path: root/crypto/cms
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-04-06 15:42:29 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-04-06 15:42:29 +0000
commitd6c813daff48b5cffa8e4ae5e264e46c4d290083 (patch)
tree60a669f2bf15d8927a5e2f76b3070cced3b123b1 /crypto/cms
parente3818a4c4be1fcfbea49ce6f98678d20f276c88d (diff)
Fix from HEAD.
Diffstat (limited to 'crypto/cms')
-rw-r--r--crypto/cms/cms_lib.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index 5b09e856c5..fd0afa96fc 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);