Revert argument swap change... oops CMS_uncompress() was consistent...

a5db50d0 · Dr. Stephen Henson · f3eba36c · a5db50d0 · a5db50d0 · a5db50d0
Showing with 4 addition and 4 deletion

apps/cms.c apps/cms.c +1 -1

crypto/cms/cms.h crypto/cms/cms.h +1 -1

crypto/cms/cms_smime.c crypto/cms/cms_smime.c +1 -1

doc/crypto/CMS_uncompress.pod doc/crypto/CMS_uncompress.pod +1 -1

未找到文件。
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -1028,7 +1028,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)

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


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

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

--- a/doc/crypto/CMS_uncompress.pod
+++ b/doc/crypto/CMS_uncompress.pod
@@ -8,7 +8,7 @@

 #include <openssl/cms.h>

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

 =head1 DESCRIPTION