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/pem/pem_lib.c | 2 +- src/lib/libcrypto/pem/pem_seal.c | 2 +- src/lib/libcrypto/pem/pem_sign.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/libcrypto/pem') diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index 5938330d45..b2f4ae0c59 100644 --- a/src/lib/libcrypto/pem/pem_lib.c +++ b/src/lib/libcrypto/pem/pem_lib.c @@ -358,7 +358,7 @@ PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x, } /* dzise + 8 bytes are needed */ /* actually it needs the cipher block size extra... */ - data = (unsigned char *)malloc((unsigned int)dsize + 20); + data = malloc((unsigned int)dsize + 20); if (data == NULL) { PEMerr(PEM_F_PEM_ASN1_WRITE_BIO, ERR_R_MALLOC_FAILURE); goto err; diff --git a/src/lib/libcrypto/pem/pem_seal.c b/src/lib/libcrypto/pem/pem_seal.c index e6e73dd23d..21d63bb496 100644 --- a/src/lib/libcrypto/pem/pem_seal.c +++ b/src/lib/libcrypto/pem/pem_seal.c @@ -85,7 +85,7 @@ PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type, if (j > max) max = j; } - s = (char *)reallocarray(NULL, max, 2); + s = reallocarray(NULL, max, 2); if (s == NULL) { PEMerr(PEM_F_PEM_SEALINIT, ERR_R_MALLOC_FAILURE); goto err; diff --git a/src/lib/libcrypto/pem/pem_sign.c b/src/lib/libcrypto/pem/pem_sign.c index bfe7823e3d..4197436bfc 100644 --- a/src/lib/libcrypto/pem/pem_sign.c +++ b/src/lib/libcrypto/pem/pem_sign.c @@ -85,7 +85,7 @@ PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, int i, ret = 0; unsigned int m_len; - m = (unsigned char *)malloc(EVP_PKEY_size(pkey) + 2); + m = malloc(EVP_PKEY_size(pkey) + 2); if (m == NULL) { PEMerr(PEM_F_PEM_SIGNFINAL, ERR_R_MALLOC_FAILURE); goto err; -- cgit v1.2.3-55-g6feb