[openssl-commits] [openssl] master update

[nic.tuv at gmail.com]

The branch master has been updated
       via  d896b79b0994a35ecfd1c8e729d348d67236150e (commit)
      from  dd41956d80686638d74fd203bd67060f90966280 (commit)


- Log -----------------------------------------------------------------
commit d896b79b0994a35ecfd1c8e729d348d67236150e
Author: Mansour Ahmadi <m.ahmadi at northeastern.edu>
Date:   Wed Oct 17 18:13:57 2018 -0400

    Check return value of EVP_PKEY_new
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7427)

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

Summary of changes:
 apps/rsa.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/rsa.c b/apps/rsa.c
index 5098a20..fdd02dc 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -269,6 +269,9 @@ int rsa_main(int argc, char **argv)
     } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
         EVP_PKEY *pk;
         pk = EVP_PKEY_new();
+        if (pk == NULL)
+            goto end;
+
         EVP_PKEY_set1_RSA(pk, rsa);
         if (outformat == FORMAT_PVK) {
             if (pubin) {