From 7852414967b87400b08bfdf321732cfbd07286e2 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 1 Mar 2016 17:22:51 +0000 Subject: [PATCH] Fix -pkeyopt and fix error check. Reviewed-by: Rich Salz --- apps/pkeyutl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c index 91ef8d73b4..3d78499cb0 100644 --- a/apps/pkeyutl.c +++ b/apps/pkeyutl.c @@ -217,7 +217,7 @@ int pkeyutl_main(int argc, char **argv) case OPT_PKEYOPT: if ((pkeyopts == NULL && (pkeyopts = sk_OPENSSL_STRING_new_null()) == NULL) || - sk_OPENSSL_STRING_push(pkeyopts, *++argv) == 0) { + sk_OPENSSL_STRING_push(pkeyopts, opt_arg()) == 0) { BIO_puts(bio_err, "out of memory\n"); goto end; } @@ -334,7 +334,8 @@ int pkeyutl_main(int argc, char **argv) buf_out, (size_t *)&buf_outlen, buf_in, (size_t)buf_inlen); } - if (rv < 0) { + if (rv <= 0) { + BIO_puts(bio_err, "Public Key operation error\n"); ERR_print_errors(bio_err); goto end; } -- GitLab