Revert argument swap change... oops CMS_uncompress() was consistent...
This commit is contained in:
parent
f3eba36c4c
commit
a5db50d005
@ -1028,7 +1028,7 @@ int MAIN(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
else if (operation == SMIME_UNCOMPRESS)
|
else if (operation == SMIME_UNCOMPRESS)
|
||||||
{
|
{
|
||||||
if (!CMS_uncompress(cms, out, indata, flags))
|
if (!CMS_uncompress(cms, indata, out, flags))
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
else if (operation == SMIME_DIGEST_VERIFY)
|
else if (operation == SMIME_DIGEST_VERIFY)
|
||||||
|
@ -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_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);
|
unsigned int flags);
|
||||||
CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags);
|
CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags);
|
||||||
|
|
||||||
|
@ -714,7 +714,7 @@ int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags)
|
|||||||
|
|
||||||
#ifdef ZLIB
|
#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)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
BIO *cont;
|
BIO *cont;
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#include <openssl/cms.h>
|
#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
|
=head1 DESCRIPTION
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user