projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow reordering of certificates when signing.
[openssl.git]
/
apps
/
smime.c
diff --git
a/apps/smime.c
b/apps/smime.c
index c583f8a0e16205bbf5b2bf56560aaafacfe0477e..d1ee48937e6d8b2b31fabc5ad09f9938423e413b 100644
(file)
--- a/
apps/smime.c
+++ b/
apps/smime.c
@@
-541,8
+541,8
@@
int MAIN(int argc, char **argv)
{
if (!cipher)
{
{
if (!cipher)
{
-#ifndef OPENSSL_NO_
RC2
- cipher = EVP_
rc2_40
_cbc();
+#ifndef OPENSSL_NO_
DES
+ cipher = EVP_
des_ede3
_cbc();
#else
BIO_printf(bio_err, "No cipher selected\n");
goto end;
#else
BIO_printf(bio_err, "No cipher selected\n");
goto end;
@@
-704,6
+704,14
@@
int MAIN(int argc, char **argv)
p7 = PKCS7_sign(NULL, NULL, other, in, flags);
if (!p7)
goto end;
p7 = PKCS7_sign(NULL, NULL, other, in, flags);
if (!p7)
goto end;
+ if (flags & PKCS7_NOCERTS)
+ {
+ for (i = 0; i < sk_X509_num(other); i++)
+ {
+ X509 *x = sk_X509_value(other, i);
+ PKCS7_add_certificate(p7, x);
+ }
+ }
}
else
flags |= PKCS7_REUSE_DIGEST;
}
else
flags |= PKCS7_REUSE_DIGEST;