diff options
| author | steve <steve> | 2008-04-11 23:23:57 +0000 |
|---|---|---|
| committer | steve <steve> | 2008-04-11 23:23:57 +0000 |
| commit | 9974fa571f80dcc0448c070e2c1591413cd8050b (patch) | |
| tree | 2dd83391a5a7905c759b9142f5b2e0e3a955b2ec | |
| parent | a7949d7ce7c3d70f68305ab2fa33acf68463caf3 (diff) | |
| download | openssl-9974fa571f80dcc0448c070e2c1591413cd8050b.tar.gz | |
Revert change from HEAD.
| -rw-r--r-- | apps/cms.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms.h | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_smime.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/cms.c b/apps/cms.c index 70bf45f3f..0b92579cb 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -1027,7 +1027,7 @@ int MAIN(int argc, char **argv) } else if (operation == SMIME_UNCOMPRESS) { - if (!CMS_uncompress(cms, out, indata, flags)) + if (!CMS_uncompress(cms, indata, out, flags)) goto end; } else if (operation == SMIME_DIGEST_VERIFY) diff --git a/crypto/cms/cms.h b/crypto/cms/cms.h index 0323de717..e5d776aac 100644 --- a/crypto/cms/cms.h +++ b/crypto/cms/cms.h @@ -216,7 +216,7 @@ int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri, int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri); -int CMS_uncompress(CMS_ContentInfo *cms, BIO *out, BIO *dcont, +int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out, unsigned int flags); CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags); diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index a529feb30..0f8b6ade4 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -725,7 +725,7 @@ int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags) #ifdef ZLIB -int CMS_uncompress(CMS_ContentInfo *cms, BIO *out, BIO *dcont, +int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out, unsigned int flags) { BIO *cont; |