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/ec/ec_ameth.c     | 2 +-
 src/lib/libcrypto/ec/ec_key.c       | 2 +-
 src/lib/libcrypto/ec/ec_mult.c      | 2 +-
 src/lib/libcrypto/ec/ec_print.c     | 2 +-
 src/lib/libcrypto/ec/ecp_nistp224.c | 2 +-
 src/lib/libcrypto/ec/ecp_nistp256.c | 2 +-
 src/lib/libcrypto/ec/ecp_nistp521.c | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c
index ec074329f2..521ada3299 100644
--- a/src/lib/libcrypto/ec/ec_ameth.c
+++ b/src/lib/libcrypto/ec/ec_ameth.c
@@ -325,7 +325,7 @@ eckey_priv_encode(PKCS8_PRIV_KEY_INFO * p8, const EVP_PKEY * pkey)
 		ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB);
 		return 0;
 	}
-	ep = (unsigned char *) malloc(eplen);
+	ep = malloc(eplen);
 	if (!ep) {
 		EC_KEY_set_enc_flags(ec_key, old_flags);
 		ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c
index 1d727ec77d..d0c35bbd22 100644
--- a/src/lib/libcrypto/ec/ec_key.c
+++ b/src/lib/libcrypto/ec/ec_key.c
@@ -70,7 +70,7 @@ EC_KEY_new(void)
 {
 	EC_KEY *ret;
 
-	ret = (EC_KEY *) malloc(sizeof(EC_KEY));
+	ret = malloc(sizeof(EC_KEY));
 	if (ret == NULL) {
 		ECerr(EC_F_EC_KEY_NEW, ERR_R_MALLOC_FAILURE);
 		return (NULL);
diff --git a/src/lib/libcrypto/ec/ec_mult.c b/src/lib/libcrypto/ec/ec_mult.c
index 8894a8f907..a2d8ce8bc1 100644
--- a/src/lib/libcrypto/ec/ec_mult.c
+++ b/src/lib/libcrypto/ec/ec_mult.c
@@ -105,7 +105,7 @@ ec_pre_comp_new(const EC_GROUP * group)
 	if (!group)
 		return NULL;
 
-	ret = (EC_PRE_COMP *) malloc(sizeof(EC_PRE_COMP));
+	ret = malloc(sizeof(EC_PRE_COMP));
 	if (!ret) {
 		ECerr(EC_F_EC_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE);
 		return ret;
diff --git a/src/lib/libcrypto/ec/ec_print.c b/src/lib/libcrypto/ec/ec_print.c
index 84a78903b3..aac1f4229a 100644
--- a/src/lib/libcrypto/ec/ec_print.c
+++ b/src/lib/libcrypto/ec/ec_print.c
@@ -141,7 +141,7 @@ EC_POINT_point2hex(const EC_GROUP * group, const EC_POINT * point,
 		free(buf);
 		return NULL;
 	}
-	ret = (char *) malloc(buf_len * 2 + 2);
+	ret = malloc(buf_len * 2 + 2);
 	if (ret == NULL) {
 		free(buf);
 		return NULL;
diff --git a/src/lib/libcrypto/ec/ecp_nistp224.c b/src/lib/libcrypto/ec/ecp_nistp224.c
index 17777f517b..9204f6148d 100644
--- a/src/lib/libcrypto/ec/ecp_nistp224.c
+++ b/src/lib/libcrypto/ec/ecp_nistp224.c
@@ -1188,7 +1188,7 @@ static NISTP224_PRE_COMP *
 nistp224_pre_comp_new()
 {
 	NISTP224_PRE_COMP *ret = NULL;
-	ret = (NISTP224_PRE_COMP *) malloc(sizeof *ret);
+	ret = malloc(sizeof *ret);
 	if (!ret) {
 		ECerr(EC_F_NISTP224_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE);
 		return ret;
diff --git a/src/lib/libcrypto/ec/ecp_nistp256.c b/src/lib/libcrypto/ec/ecp_nistp256.c
index 7fe7be27de..cd589ff611 100644
--- a/src/lib/libcrypto/ec/ecp_nistp256.c
+++ b/src/lib/libcrypto/ec/ecp_nistp256.c
@@ -1737,7 +1737,7 @@ static NISTP256_PRE_COMP *
 nistp256_pre_comp_new()
 {
 	NISTP256_PRE_COMP *ret = NULL;
-	ret = (NISTP256_PRE_COMP *) malloc(sizeof *ret);
+	ret = malloc(sizeof *ret);
 	if (!ret) {
 		ECerr(EC_F_NISTP256_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE);
 		return ret;
diff --git a/src/lib/libcrypto/ec/ecp_nistp521.c b/src/lib/libcrypto/ec/ecp_nistp521.c
index 5d5a747ee8..fc8703e4c8 100644
--- a/src/lib/libcrypto/ec/ecp_nistp521.c
+++ b/src/lib/libcrypto/ec/ecp_nistp521.c
@@ -1628,7 +1628,7 @@ static NISTP521_PRE_COMP *
 nistp521_pre_comp_new()
 {
 	NISTP521_PRE_COMP *ret = NULL;
-	ret = (NISTP521_PRE_COMP *) malloc(sizeof(NISTP521_PRE_COMP));
+	ret = malloc(sizeof(NISTP521_PRE_COMP));
 	if (!ret) {
 		ECerr(EC_F_NISTP521_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE);
 		return ret;
-- 
cgit v1.2.3-55-g6feb