summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/pkcs7.c10
-rw-r--r--apps/s_server.c2
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) {