diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-04-11 17:34:13 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-04-11 17:34:13 +0000 |
| commit | 529d329ce10946137c096dc0e4e8965e04a1424f (patch) | |
| tree | c809d0f64006825481717f30a458ce654e7cc56f | |
| parent | 47a6d388c71e5021a172520ef2fc04ffa9f706e7 (diff) | |
Make CMS_uncompress() argument order consistent with other functions.
| -rw-r--r-- | apps/cms.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms.h | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_smime.c | 2 | ||||
| -rw-r--r-- | doc/crypto/CMS_uncompress.pod | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/cms.c b/apps/cms.c index b1ffb382ad..e0c4c99485 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, indata, out, flags)) + if (!CMS_uncompress(cms, out, indata, flags)) goto end; } else if (operation == SMIME_DIGEST_VERIFY) diff --git a/crypto/cms/cms.h b/crypto/cms/cms.h index 9b32231d70..8b4404a91c 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 *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); diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index 6f44c84a5f..0910f05019 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 *dcont, BIO *out, +int CMS_uncompress(CMS_ContentInfo *cms, BIO *out, BIO *dcont, unsigned int flags) { BIO *cont; diff --git a/doc/crypto/CMS_uncompress.pod b/doc/crypto/CMS_uncompress.pod index c6056b027d..746ea2cb29 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 *dcont, BIO *out, unsigned int flags); + int CMS_uncompress(CMS_ContentInfo *cms, BIO *out, BIO *dcont, unsigned int flags); =head1 DESCRIPTION |