From a5db50d005637faba968b4173f2e81f07ebd7469 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Fri, 11 Apr 2008 23:23:18 +0000
Subject: [PATCH] Revert argument swap change... oops CMS_uncompress() was
consistent...
---
apps/cms.c | 2 +-
crypto/cms/cms.h | 2 +-
crypto/cms/cms_smime.c | 2 +-
doc/crypto/CMS_uncompress.pod | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/cms.c b/apps/cms.c
index e0c4c9948..b1ffb382a 100644
--- 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)
diff --git a/crypto/cms/cms.h b/crypto/cms/cms.h
index 8b4404a91..9b32231d7 100644
--- 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);
diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index 0910f0501..6f44c84a5 100644
--- 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;
diff --git a/doc/crypto/CMS_uncompress.pod b/doc/crypto/CMS_uncompress.pod
index 746ea2cb2..c6056b027 100644
--- 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