diff options
| author | Ben Laurie <ben@openssl.org> | 2012-06-08 09:18:47 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2012-06-08 09:18:47 +0000 |
| commit | af454b5bb09bf647b4854dc277f2eefc151b2608 (patch) | |
| tree | dc263a92a0e3e5c73ec5ea049a92411f51e0eb57 /crypto/cms | |
| parent | 5b2bbf37fa2f90ac1b6ab381179d739ae376723b (diff) | |
Reduce version skew.
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_enc.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_lib.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c index f873ce3794..bebeaf29c7 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 f88e8f3b52..b62d1bfac0 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); } } |