From 800fbde652d67326eeb163d56d8f72ebb239b3c4 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sat, 7 Jun 2014 14:41:57 +0000
Subject: malloc() result does not need a cast. ok miod

---
 src/lib/libcrypto/bn/bn_exp.c   | 2 +-
 src/lib/libcrypto/bn/bn_mont.c  | 2 +-
 src/lib/libcrypto/bn/bn_print.c | 4 ++--
 src/lib/libcrypto/bn/bn_rand.c  | 2 +-
 src/lib/libcrypto/bn/bn_recp.c  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib/libcrypto/bn')

diff --git a/src/lib/libcrypto/bn/bn_exp.c b/src/lib/libcrypto/bn/bn_exp.c
index a27373c97b..af88798eff 100644
--- a/src/lib/libcrypto/bn/bn_exp.c
+++ b/src/lib/libcrypto/bn/bn_exp.c
@@ -627,7 +627,7 @@ BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
 	numPowers = 1 << window;
 	powerbufLen = sizeof(m->d[0]) * (top * numPowers +
 	    ((2*top) > numPowers ? (2*top) : numPowers));
-	if ((powerbufFree = (unsigned char*)malloc(powerbufLen +
+	if ((powerbufFree = malloc(powerbufLen +
 	    MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH)) == NULL)
 		goto err;
 
diff --git a/src/lib/libcrypto/bn/bn_mont.c b/src/lib/libcrypto/bn/bn_mont.c
index 073dfeffee..af7b083530 100644
--- a/src/lib/libcrypto/bn/bn_mont.c
+++ b/src/lib/libcrypto/bn/bn_mont.c
@@ -325,7 +325,7 @@ BN_MONT_CTX_new(void)
 {
 	BN_MONT_CTX *ret;
 
-	if ((ret = (BN_MONT_CTX *)malloc(sizeof(BN_MONT_CTX))) == NULL)
+	if ((ret = malloc(sizeof(BN_MONT_CTX))) == NULL)
 		return (NULL);
 
 	BN_MONT_CTX_init(ret);
diff --git a/src/lib/libcrypto/bn/bn_print.c b/src/lib/libcrypto/bn/bn_print.c
index ad3a847f01..4685389bf8 100644
--- a/src/lib/libcrypto/bn/bn_print.c
+++ b/src/lib/libcrypto/bn/bn_print.c
@@ -72,7 +72,7 @@ BN_bn2hex(const BIGNUM *a)
 	char *buf;
 	char *p;
 
-	buf = (char *)malloc(a->top * BN_BYTES * 2 + 2);
+	buf = malloc(a->top * BN_BYTES * 2 + 2);
 	if (buf == NULL) {
 		BNerr(BN_F_BN_BN2HEX, ERR_R_MALLOC_FAILURE);
 		goto err;
@@ -117,7 +117,7 @@ BN_bn2dec(const BIGNUM *a)
 	i = BN_num_bits(a) * 3;
 	num = (i / 10 + i / 1000 + 1) + 1;
 	bn_data = reallocarray(NULL, num / BN_DEC_NUM + 1, sizeof(BN_ULONG));
-	buf = (char *)malloc(num + 3);
+	buf = malloc(num + 3);
 	if ((buf == NULL) || (bn_data == NULL)) {
 		BNerr(BN_F_BN_BN2DEC, ERR_R_MALLOC_FAILURE);
 		goto err;
diff --git a/src/lib/libcrypto/bn/bn_rand.c b/src/lib/libcrypto/bn/bn_rand.c
index 488b7c6e63..0073eec35c 100644
--- a/src/lib/libcrypto/bn/bn_rand.c
+++ b/src/lib/libcrypto/bn/bn_rand.c
@@ -130,7 +130,7 @@ bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
 	bit = (bits - 1) % 8;
 	mask = 0xff << (bit + 1);
 
-	buf = (unsigned char *)malloc(bytes);
+	buf = malloc(bytes);
 	if (buf == NULL) {
 		BNerr(BN_F_BNRAND, ERR_R_MALLOC_FAILURE);
 		goto err;
diff --git a/src/lib/libcrypto/bn/bn_recp.c b/src/lib/libcrypto/bn/bn_recp.c
index 31fe4eb897..89d6bd480d 100644
--- a/src/lib/libcrypto/bn/bn_recp.c
+++ b/src/lib/libcrypto/bn/bn_recp.c
@@ -74,7 +74,7 @@ BN_RECP_CTX_new(void)
 {
 	BN_RECP_CTX *ret;
 
-	if ((ret = (BN_RECP_CTX *)malloc(sizeof(BN_RECP_CTX))) == NULL)
+	if ((ret = malloc(sizeof(BN_RECP_CTX))) == NULL)
 		return (NULL);
 
 	BN_RECP_CTX_init(ret);
-- 
cgit v1.2.3-55-g6feb