diff options
| author | miod <> | 2014-04-13 15:16:40 +0000 | 
|---|---|---|
| committer | miod <> | 2014-04-13 15:16:40 +0000 | 
| commit | dbf195d7fd4efbe4ee578f1dc5c72e7f3deadf18 (patch) | |
| tree | 0de23bccc2c4fc24d466d6a4291987efc8e44770 /src/lib/libcrypto/cms/cms_lib.c | |
| parent | 210506dd94a697493eb809fb31df7283912ded73 (diff) | |
| parent | 52628ee3f51f011b463aaedb1a28aa0524b43cb3 (diff) | |
| download | openbsd-dbf195d7fd4efbe4ee578f1dc5c72e7f3deadf18.tar.gz openbsd-dbf195d7fd4efbe4ee578f1dc5c72e7f3deadf18.tar.bz2 openbsd-dbf195d7fd4efbe4ee578f1dc5c72e7f3deadf18.zip | |
This commit was generated by cvs2git to track changes on a CVS vendor
branch.
Diffstat (limited to 'src/lib/libcrypto/cms/cms_lib.c')
| -rw-r--r-- | src/lib/libcrypto/cms/cms_lib.c | 4 | 
1 files changed, 0 insertions, 4 deletions
| diff --git a/src/lib/libcrypto/cms/cms_lib.c b/src/lib/libcrypto/cms/cms_lib.c index f88e8f3b52..ba08279a04 100644 --- a/src/lib/libcrypto/cms/cms_lib.c +++ b/src/lib/libcrypto/cms/cms_lib.c | |||
| @@ -411,9 +411,7 @@ int cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain, | |||
| 411 | * algorithm OID instead of digest. | 411 | * algorithm OID instead of digest. | 
| 412 | */ | 412 | */ | 
| 413 | || EVP_MD_pkey_type(EVP_MD_CTX_md(mtmp)) == nid) | 413 | || EVP_MD_pkey_type(EVP_MD_CTX_md(mtmp)) == nid) | 
| 414 | { | ||
| 415 | return EVP_MD_CTX_copy_ex(mctx, mtmp); | 414 | return EVP_MD_CTX_copy_ex(mctx, mtmp); | 
| 416 | } | ||
| 417 | chain = BIO_next(chain); | 415 | chain = BIO_next(chain); | 
| 418 | } | 416 | } | 
| 419 | } | 417 | } | 
| @@ -467,8 +465,6 @@ int CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert) | |||
| 467 | pcerts = cms_get0_certificate_choices(cms); | 465 | pcerts = cms_get0_certificate_choices(cms); | 
| 468 | if (!pcerts) | 466 | if (!pcerts) | 
| 469 | return 0; | 467 | return 0; | 
| 470 | if (!pcerts) | ||
| 471 | return 0; | ||
| 472 | for (i = 0; i < sk_CMS_CertificateChoices_num(*pcerts); i++) | 468 | for (i = 0; i < sk_CMS_CertificateChoices_num(*pcerts); i++) | 
| 473 | { | 469 | { | 
| 474 | cch = sk_CMS_CertificateChoices_value(*pcerts, i); | 470 | cch = sk_CMS_CertificateChoices_value(*pcerts, i); | 
