summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/apps/smime.c
diff options
context:
space:
mode:
authornectar <nectar@FreeBSD.org>2002-07-30 12:44:15 +0000
committernectar <nectar@FreeBSD.org>2002-07-30 12:44:15 +0000
commit0aed2eea83b351d68092e43b5a9496ce3dd5043d (patch)
treea6133c35ab337984fbbd26293f8b1ad7a958132b /crypto/openssl/apps/smime.c
parent1f8c2aa1763b5d8a328b2fd4053396e94ea48d35 (diff)
downloadFreeBSD-src-0aed2eea83b351d68092e43b5a9496ce3dd5043d.zip
FreeBSD-src-0aed2eea83b351d68092e43b5a9496ce3dd5043d.tar.gz
Import of OpenSSL 0.9.6d.
Diffstat (limited to 'crypto/openssl/apps/smime.c')
-rw-r--r--crypto/openssl/apps/smime.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/openssl/apps/smime.c b/crypto/openssl/apps/smime.c
index 564331b..ebdac15 100644
--- a/crypto/openssl/apps/smime.c
+++ b/crypto/openssl/apps/smime.c
@@ -414,7 +414,10 @@ int MAIN(int argc, char **argv)
p7 = PKCS7_encrypt(encerts, in, cipher, flags);
} else if(operation == SMIME_SIGN) {
p7 = PKCS7_sign(signer, key, other, in, flags);
- BIO_reset(in);
+ if (BIO_reset(in) != 0 && (flags & PKCS7_DETACHED)) {
+ BIO_printf(bio_err, "Can't rewind input file\n");
+ goto end;
+ }
} else {
if(informat == FORMAT_SMIME)
p7 = SMIME_read_PKCS7(in, &indata);
@@ -454,9 +457,9 @@ int MAIN(int argc, char **argv)
} else if(operation == SMIME_VERIFY) {
STACK_OF(X509) *signers;
if(PKCS7_verify(p7, other, store, indata, out, flags)) {
- BIO_printf(bio_err, "Verification Successful\n");
+ BIO_printf(bio_err, "Verification successful\n");
} else {
- BIO_printf(bio_err, "Verification Failure\n");
+ BIO_printf(bio_err, "Verification failure\n");
goto end;
}
signers = PKCS7_get0_signers(p7, other, flags);
OpenPOWER on IntegriCloud