Make CMS_uncompress() argument order consistent with other functions.

diff --git a/apps/cms.c b/apps/cms.c
index b1ffb382ad1b37874a4b718091249eb905b824a1..e0c4c99485a3b4a6894774ad03f2fb77a0a1ecb6 100644 (file)
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -1028,7 +1028,7 @@ int MAIN(int argc, char **argv)
                }
        else if (operation == SMIME_UNCOMPRESS)
                {
                }
        else if (operation == SMIME_UNCOMPRESS)
                {

-               if (!CMS_uncompress(cms, indata, out, flags))
+               if (!CMS_uncompress(cms, out, indata, flags))

                        goto end;
                }
        else if (operation == SMIME_DIGEST_VERIFY)
                        goto end;
                }
        else if (operation == SMIME_DIGEST_VERIFY)

diff --git a/crypto/cms/cms.h b/crypto/cms/cms.h
index 9b32231d70dfba5c0dceae794198417151adb799..8b4404a91c405e25d07a388227450c11f7539d35 100644 (file)
--- a/crypto/cms/cms.h
+++ b/crypto/cms/cms.h
@@ -221,7 +221,7 @@ int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,
 
 int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
        
 
 int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
        

-int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
+int CMS_uncompress(CMS_ContentInfo *cms, BIO *out, BIO *dcont,

                                                        unsigned int flags);
 CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags);
 
                                                        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 6f44c84a5f75b5bc2480b46d3f944cb3acdf627c..0910f05019bfea0abf8d14e36d0b4d395f99e57d 100644 (file)
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -714,7 +714,7 @@ int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags)
 
 #ifdef ZLIB
 
 
 #ifdef ZLIB
 

-int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
+int CMS_uncompress(CMS_ContentInfo *cms, BIO *out, BIO *dcont,

                                                        unsigned int flags)
        {
        BIO *cont;
                                                        unsigned int flags)
        {
        BIO *cont;

diff --git a/doc/crypto/CMS_uncompress.pod b/doc/crypto/CMS_uncompress.pod
index c6056b027da584a0277facac4965182f7d79b2a9..746ea2cb2997437433cf08f47159521b2a15f112 100644 (file)
--- a/doc/crypto/CMS_uncompress.pod
+++ b/doc/crypto/CMS_uncompress.pod
@@ -8,7 +8,7 @@
 
  #include <openssl/cms.h>
 
 
  #include <openssl/cms.h>
 

- int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out, unsigned int flags);
+ int CMS_uncompress(CMS_ContentInfo *cms, BIO *out, BIO *dcont, unsigned int flags);

 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION