[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  df09b6b5f9088db10ef13dd71999db9b282b8d1a (commit)
      from  61d7045bd234d82b689ad314bfe57bfc478358fb (commit)


- Log -----------------------------------------------------------------
commit df09b6b5f9088db10ef13dd71999db9b282b8d1a
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Sun Apr 7 11:45:36 2019 +1000

    coverity resource leak fixes in apps/pkeyutl
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8691)

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

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

diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index 7f1e621..c8cac0d 100644
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -688,7 +688,7 @@ static int do_raw_keyop(int pkey_op, EVP_PKEY_CTX *ctx,
         if (filesize < 0) {
             BIO_printf(bio_err,
                        "Error: unable to determine file size for oneshot operation\n");
-            return rv;
+            goto end;
         }
         mbuf = app_malloc(filesize, "oneshot sign/verify buffer");
         switch(pkey_op) {
@@ -717,7 +717,6 @@ static int do_raw_keyop(int pkey_op, EVP_PKEY_CTX *ctx,
             }
             break;
         }
-        OPENSSL_free(mbuf);
         goto end;
     }
 
@@ -767,6 +766,7 @@ static int do_raw_keyop(int pkey_op, EVP_PKEY_CTX *ctx,
     }
 
  end:
+    OPENSSL_free(mbuf);
     EVP_MD_CTX_free(mctx);
     return rv;
 }