[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  589902b2cbc667564642a0fdedfb2ef176dba0e8 (commit)
      from  2194351fdaab91cff94f921e633d46c9589b0d2c (commit)


- Log -----------------------------------------------------------------
commit 589902b2cbc667564642a0fdedfb2ef176dba0e8
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon May 16 14:58:00 2016 -0400

    Use app_malloc; two missing cases.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/apps.c     | 2 +-
 apps/s_client.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/apps.c b/apps/apps.c
index c7e01b0..1d3c66a 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2633,7 +2633,7 @@ void wait_for_async(SSL *s)
         return;
     if (numfds == 0)
         return;
-    fds = OPENSSL_malloc(sizeof(OSSL_ASYNC_FD) * numfds);
+    fds = app_malloc(sizeof(OSSL_ASYNC_FD) * numfds, "allocate async fds");
     if (!SSL_get_all_async_fds(s, fds, &numfds)) {
         OPENSSL_free(fds);
     }
diff --git a/apps/s_client.c b/apps/s_client.c
index 42ef049..fada838 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -509,7 +509,7 @@ static ossl_ssize_t hexdecode(const char **inptr, void *result)
 {
     unsigned char **out = (unsigned char **)result;
     const char *in = *inptr;
-    unsigned char *ret = OPENSSL_malloc(strlen(in)/2);
+    unsigned char *ret = app_malloc(strlen(in)/2, "hexdecode");
     unsigned char *cp = ret;
     uint8_t byte;
     int nibble = 0;