summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/smime.c
diff options
context:
space:
mode:
authordoug <>2015-02-08 10:22:45 +0000
committerdoug <>2015-02-08 10:22:45 +0000
commitf5656e5948afd96eceeae5f83939965ba96edc28 (patch)
treeba58b46fda227cb1089ceb084bb49a3366291f24 /src/usr.bin/openssl/smime.c
parent653ed322d15a6087960710834e7221c7ff8b0af1 (diff)
downloadopenbsd-f5656e5948afd96eceeae5f83939965ba96edc28.tar.gz
openbsd-f5656e5948afd96eceeae5f83939965ba96edc28.tar.bz2
openbsd-f5656e5948afd96eceeae5f83939965ba96edc28.zip
Delete commented out code from openssl(1) apps.
From OpenSSL commits: 6f91b017bbb7140f816721141ac156d1b828a6b3 75d0ebef2aef7a2c77b27575b8da898e22f3ccd5 a2b18e657ea1a932d125154f4e13ab2258796d90 ok miod@, jsing@
Diffstat (limited to '')
-rw-r--r--src/usr.bin/openssl/smime.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/usr.bin/openssl/smime.c b/src/usr.bin/openssl/smime.c
index 155bb8b03d..8b76ea9e78 100644
--- a/src/usr.bin/openssl/smime.c
+++ b/src/usr.bin/openssl/smime.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: smime.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: smime.c,v 1.2 2015/02/08 10:22:45 doug Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -446,10 +446,7 @@ argerr:
446 encerts = sk_X509_new_null(); 446 encerts = sk_X509_new_null();
447 while (*args) { 447 while (*args) {
448 if (!(cert = load_cert(bio_err, *args, FORMAT_PEM, 448 if (!(cert = load_cert(bio_err, *args, FORMAT_PEM,
449 NULL, e, "recipient certificate file"))) { 449 NULL, e, "recipient certificate file"))) {
450#if 0 /* An appropriate message is already printed */
451 BIO_printf(bio_err, "Can't read recipient certificate file %s\n", *args);
452#endif
453 goto end; 450 goto end;
454 } 451 }
455 sk_X509_push(encerts, cert); 452 sk_X509_push(encerts, cert);