diff options
author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-04-20 10:42:58 +0000 |
---|---|---|
committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-04-20 10:42:58 +0000 |
commit | 19c7d1a8561ff0e7262b8bfa74721581734e68f9 (patch) | |
tree | 8d8670c28357b7fae75acc7e22ccf354b107cc0e /crypto/cms/cms_lib.c | |
parent | 2bee25a915c2ba40e58229788aabc97765426016 (diff) | |
parent | ed9938171f80c7534f6eb52f75c2538bca462807 (diff) | |
download | openssl-new-19c7d1a8561ff0e7262b8bfa74721581734e68f9.tar.gz |
Merge remote-tracking branch 'origin/baserock/OpenSSL_1_0_1g' into baserock/ps/proto-web-systembaserock/ps/proto-web-system
Diffstat (limited to 'crypto/cms/cms_lib.c')
-rw-r--r-- | crypto/cms/cms_lib.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index b62d1bfac0..ba08279a04 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -465,8 +465,6 @@ int CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert) pcerts = cms_get0_certificate_choices(cms); if (!pcerts) return 0; - if (!pcerts) - return 0; for (i = 0; i < sk_CMS_CertificateChoices_num(*pcerts); i++) { cch = sk_CMS_CertificateChoices_value(*pcerts, i); |