From: Richard Levitte <levitte@openssl.org>
Date: Tue, 24 Mar 2015 11:16:31 +0000 (+0100)
Subject: Use OPENSSL_malloc rather than malloc/calloc
X-Git-Tag: OpenSSL_1_1_0-pre1~1473
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=2383a74be14d26d57bf7e56a2f2688705577d5e7

Use OPENSSL_malloc rather than malloc/calloc

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index 6f66254c9e..d005e017e4 100644
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -1022,9 +1022,10 @@ static int bn2crparam(const BIGNUM *a, struct crparam *crp)
     bits = BN_num_bits(a);
     bytes = BN_num_bytes(a);
 
-    b = calloc(bytes,1);
+    b = OPENSSL_malloc(bytes);
     if (b == NULL)
         return (1);
+    memset(b, 0, bytes);
 
     crp->crp_p = (caddr_t) b;
     crp->crp_nbits = bits;
@@ -1044,7 +1045,7 @@ static int crparam2bn(struct crparam *crp, BIGNUM *a)
     if (bytes == 0)
         return (-1);
 
-    if ((pd = (u_int8_t *) malloc(bytes)) == NULL)
+    if ((pd = (u_int8_t *) OPENSSL_malloc(bytes)) == NULL)
         return (-1);
 
     for (i = 0; i < bytes; i++)