[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  7852414967b87400b08bfdf321732cfbd07286e2 (commit)
      from  09977dd095f3c655c99b9e1810a213f7eafa7364 (commit)


- Log -----------------------------------------------------------------
commit 7852414967b87400b08bfdf321732cfbd07286e2
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Mar 1 17:22:51 2016 +0000

    Fix -pkeyopt and fix error check.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/pkeyutl.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index 91ef8d7..3d78499 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;
     }