diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2013-02-13 22:15:56 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2013-02-13 22:15:56 +0000 |
| commit | f3b8b34a882a09ff73facc4c6ce7cdcad59b8656 (patch) | |
| tree | 79d6c350c61cb2c6055ac3b21d94c152a09b44ff /crypto/cms | |
| parent | 451758c6115bda75e299808f60c4403de86398a8 (diff) | |
Notes
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_cd.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_enc.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_lib.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c index a5fc2c4e2b42..202168810126 100644 --- a/crypto/cms/cms_cd.c +++ b/crypto/cms/cms_cd.c @@ -58,7 +58,9 @@ #include <openssl/err.h> #include <openssl/cms.h> #include <openssl/bio.h> +#ifndef OPENSSL_NO_COMP #include <openssl/comp.h> +#endif #include "cms_lcl.h" DECLARE_ASN1_ITEM(CMS_CompressedData) diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c index f873ce379445..bebeaf29c7ba 100644 --- a/crypto/cms/cms_enc.c +++ b/crypto/cms/cms_enc.c @@ -74,7 +74,7 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec) X509_ALGOR *calg = ec->contentEncryptionAlgorithm; unsigned char iv[EVP_MAX_IV_LENGTH], *piv = NULL; unsigned char *tkey = NULL; - size_t tkeylen; + size_t tkeylen = 0; int ok = 0; diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index f88e8f3b5257..b62d1bfac02b 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -411,9 +411,7 @@ int cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain, * algorithm OID instead of digest. */ || EVP_MD_pkey_type(EVP_MD_CTX_md(mtmp)) == nid) - { return EVP_MD_CTX_copy_ex(mctx, mtmp); - } chain = BIO_next(chain); } } |