Revert change from HEAD.

This commit is contained in:
Dr. Stephen Henson 2008-04-11 23:23:57 +00:00
parent 339654e163
commit b983322bfb
3 changed files with 3 additions and 3 deletions

View File

@ -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)

View File

@ -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);

View File

@ -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;