diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
| commit | 7c21629fbeb51b65fd0625bb36d888587d62fd89 (patch) | |
| tree | 425433df36d64f529d2222de2d1680e0b0abca3f /openssl/demos/cms | |
| parent | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (diff) | |
| parent | 242d48135a12fc9167430f391ba0d27d9ad44c6b (diff) | |
| download | vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.gz vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.bz2 vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/demos/cms')
| -rw-r--r-- | openssl/demos/cms/cms_comp.c | 2 | ||||
| -rw-r--r-- | openssl/demos/cms/cms_dec.c | 2 | ||||
| -rw-r--r-- | openssl/demos/cms/cms_sign.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/openssl/demos/cms/cms_comp.c b/openssl/demos/cms/cms_comp.c index b7943e813..01bf09254 100644 --- a/openssl/demos/cms/cms_comp.c +++ b/openssl/demos/cms/cms_comp.c @@ -10,7 +10,7 @@ int main(int argc, char **argv) int ret = 1; /* - * On OpenSSL 0.9.9 only: + * On OpenSSL 1.0.0+ only: * for streaming set CMS_STREAM */ int flags = CMS_STREAM; diff --git a/openssl/demos/cms/cms_dec.c b/openssl/demos/cms/cms_dec.c index 7ddf65326..9fee0a3eb 100644 --- a/openssl/demos/cms/cms_dec.c +++ b/openssl/demos/cms/cms_dec.c @@ -47,7 +47,7 @@ int main(int argc, char **argv) goto err; /* Decrypt S/MIME message */ - if (!CMS_decrypt(cms, rkey, rcert, out, NULL, 0)) + if (!CMS_decrypt(cms, rkey, rcert, NULL, out, 0)) goto err; ret = 0; diff --git a/openssl/demos/cms/cms_sign.c b/openssl/demos/cms/cms_sign.c index 42f762034..6823c34a0 100644 --- a/openssl/demos/cms/cms_sign.c +++ b/openssl/demos/cms/cms_sign.c @@ -12,7 +12,7 @@ int main(int argc, char **argv) int ret = 1; /* For simple S/MIME signing use CMS_DETACHED. - * On OpenSSL 0.9.9 only: + * On OpenSSL 1.0.0 only: * for streaming detached set CMS_DETACHED|CMS_STREAM * for streaming non-detached set CMS_STREAM */ |