Revert change from HEAD.

diff --git a/apps/cms.c b/apps/cms.c
index 70bf45f3f4602e88f10c69b2c45bd7c58dcbc524..0b92579cbb5a0060925d4dd2f242d079f54cd2f4 100644 (file)
--- 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 0323de717ff8684f8c5447665024bf11ae5e3e07..e5d776aacf3f02888858c6b0f7be217cbbad77fb 100644 (file)
--- 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 a529feb30eec3b90a9d58f42986040cbf7cdcee0..0f8b6ade43f217db9bb97c9c4c8cb5be2f8a8fff 100644 (file)
--- 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;