Fix -pkeyopt and fix error check.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index 91ef8d73b4f5afc051194cd17b6596ed67a88987..3d78499cb049509b8279a3a978ee868de6e59e9d 100644 (file)
--- 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;
     }