[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  35e264c03232c7843733caa80f8e16bef7e2e829 (commit)
       via  b481fbe68b8d561012a611bd6f46b0c8aa8fcbaa (commit)
      from  d5fdb6a695b457cf1eea8d7b638ffde029231080 (commit)


- Log -----------------------------------------------------------------
commit 35e264c03232c7843733caa80f8e16bef7e2e829
Author: Pauli <paul.dale at oracle.com>
Date:   Sun Jul 14 17:55:15 2019 +1000

    Coverity #1451596: check dirlen for being negative
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/9362)

commit b481fbe68b8d561012a611bd6f46b0c8aa8fcbaa
Author: Pauli <paul.dale at oracle.com>
Date:   Sun Jul 14 17:53:17 2019 +1000

    Coverity #1451595: use correct free function.
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/9362)

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

Summary of changes:
 apps/speed.c           | 4 ++--
 crypto/asn1/bio_ndef.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/speed.c b/apps/speed.c
index a5e9d44..88e0069 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -3638,7 +3638,7 @@ static int do_multi(int multi, int size_num)
             close(fd[1]);
             mr = 1;
             usertime = 0;
-            free(fds);
+            OPENSSL_free(fds);
             return 0;
         }
         printf("Forked child %d\n", n);
@@ -3750,7 +3750,7 @@ static int do_multi(int multi, int size_num)
 
         fclose(f);
     }
-    free(fds);
+    OPENSSL_free(fds);
     return 1;
 }
 #endif
diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c
index d3be967..db9bbba 100644
--- a/crypto/asn1/bio_ndef.c
+++ b/crypto/asn1/bio_ndef.c
@@ -184,6 +184,8 @@ static int ndef_suffix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
         return 0;
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
+    if (derlen < 0)
+        return 0;
     if ((p = OPENSSL_malloc(derlen)) == NULL) {
         ASN1err(ASN1_F_NDEF_SUFFIX, ERR_R_MALLOC_FAILURE);
         return 0;