summaryrefslogtreecommitdiffstats
path: root/crypto/cms
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-04-11 23:23:57 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-04-11 23:23:57 +0000
commitb983322bfbc75d0bc03ae2c3ffd99504a636fb2e (patch)
tree5c408ea0cd1125adabeca016781aa4e70ee7ba3f /crypto/cms
parent339654e1631f5e0707db0ad3cbad8b4db02cf4f9 (diff)
Revert change from HEAD.
Diffstat (limited to 'crypto/cms')
-rw-r--r--crypto/cms/cms.h2
-rw-r--r--crypto/cms/cms_smime.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/cms/cms.h b/crypto/cms/cms.h
index 0323de717f..e5d776aacf 100644
--- a/crypto/cms/cms.h
+++ b/crypto/cms/cms.h
@@ -216,7 +216,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 a529feb30e..0f8b6ade43 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -725,7 +725,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;