summaryrefslogtreecommitdiffstats
path: root/apps/pkcs7.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-03-12 15:09:00 +0100
committerMatt Caswell <matt@openssl.org>2015-03-17 15:49:01 +0100
commit11abf92259e899f4f7da4a3e80781e84b0fb1a64 (patch)
tree35f6dfcaf3f60469b39f19a379c13de32438b956 /apps/pkcs7.c
parentRemove dead code from crypto (diff)
downloadopenssl-11abf92259e899f4f7da4a3e80781e84b0fb1a64.tar.xz
openssl-11abf92259e899f4f7da4a3e80781e84b0fb1a64.zip
Dead code removal from apps
Some miscellaneous removal of dead code from apps. Also fix an issue with error handling with pkcs7. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/pkcs7.c')
-rw-r--r--apps/pkcs7.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 4d80f8249e..643507f216 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -189,11 +189,11 @@ int MAIN(int argc, char **argv)
if (infile == NULL)
BIO_set_fp(in, stdin, BIO_NOCLOSE);
else {
- if (BIO_read_filename(in, infile) <= 0)
- if (in == NULL) {
- perror(infile);
- goto end;
- }
+ if (BIO_read_filename(in, infile) <= 0) {
+ BIO_printf(bio_err, "unable to load input file\n");
+ ERR_print_errors(bio_err);
+ goto end;
+ }
}
if (informat == FORMAT_ASN1)