Commit 529d329c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make CMS_uncompress() argument order consistent with other functions.

parent 47a6d388

apps/cms.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

crypto/cms/cms.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

crypto/cms/cms_smime.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

doc/crypto/CMS_uncompress.pod

+1 −1
Original line number Diff line number Diff line
@@ -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