diff options
| author | Matt Caswell <matt@openssl.org> | 2015-03-12 14:09:00 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-03-17 14:52:46 +0000 |
| commit | 636c42d747deb5cab78b66566e5feb4ffd61d15d (patch) | |
| tree | c0c14b505e65de19f52128e0e4711457882bbbcd | |
| parent | 28e4f659c5542f1625b5c20c51eab3987914b485 (diff) | |
| download | openssl-new-636c42d747deb5cab78b66566e5feb4ffd61d15d.tar.gz | |
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>
(cherry picked from commit 11abf92259e899f4f7da4a3e80781e84b0fb1a64)
| -rw-r--r-- | apps/pkcs7.c | 10 | ||||
| -rw-r--r-- | apps/s_server.c | 2 |
2 files changed, 6 insertions, 6 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) diff --git a/apps/s_server.c b/apps/s_server.c index caba5b3af0..bcf5c33137 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -334,7 +334,7 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity, } if (s_debug) BIO_printf(bio_s_out, "identity_len=%d identity=%s\n", - identity ? (int)strlen(identity) : 0, identity); + (int)strlen(identity), identity); /* here we could lookup the given identity e.g. from a database */ if (strcmp(identity, psk_identity) != 0) { |