Make CMS_uncompress() argument order consistent with other functions.
authorDr. Stephen Henson <steve@openssl.org>
Fri, 11 Apr 2008 17:34:13 +0000 (17:34 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 11 Apr 2008 17:34:13 +0000 (17:34 +0000)
apps/cms.c
crypto/cms/cms.h
crypto/cms/cms_smime.c
doc/crypto/CMS_uncompress.pod

index b1ffb38..e0c4c99 100644 (file)
@@ -1028,7 +1028,7 @@ int MAIN(int argc, char **argv)
                }
        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)
index 9b32231..8b4404a 100644 (file)
@@ -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_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);
 
index 6f44c84..0910f05 100644 (file)
@@ -714,7 +714,7 @@ int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags)
 
 #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;
index c6056b0..746ea2c 100644 (file)
@@ -8,7 +8,7 @@
 
  #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