diff options
| author | deraadt <> | 2014-06-07 14:41:57 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-06-07 14:41:57 +0000 |
| commit | 800fbde652d67326eeb163d56d8f72ebb239b3c4 (patch) | |
| tree | c0956c22011ba4358ae4ab650adf0e744f93f40c /src/lib/libcrypto/pem | |
| parent | 99e1482c930054f5a075761b96ee19aa8e1a4596 (diff) | |
| download | openbsd-800fbde652d67326eeb163d56d8f72ebb239b3c4.tar.gz openbsd-800fbde652d67326eeb163d56d8f72ebb239b3c4.tar.bz2 openbsd-800fbde652d67326eeb163d56d8f72ebb239b3c4.zip | |
malloc() result does not need a cast.
ok miod
Diffstat (limited to 'src/lib/libcrypto/pem')
| -rw-r--r-- | src/lib/libcrypto/pem/pem_lib.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/pem/pem_seal.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/pem/pem_sign.c | 2 |
3 files changed, 3 insertions, 3 deletions
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, | |||
| 358 | } | 358 | } |
| 359 | /* dzise + 8 bytes are needed */ | 359 | /* dzise + 8 bytes are needed */ |
| 360 | /* actually it needs the cipher block size extra... */ | 360 | /* actually it needs the cipher block size extra... */ |
| 361 | data = (unsigned char *)malloc((unsigned int)dsize + 20); | 361 | data = malloc((unsigned int)dsize + 20); |
| 362 | if (data == NULL) { | 362 | if (data == NULL) { |
| 363 | PEMerr(PEM_F_PEM_ASN1_WRITE_BIO, ERR_R_MALLOC_FAILURE); | 363 | PEMerr(PEM_F_PEM_ASN1_WRITE_BIO, ERR_R_MALLOC_FAILURE); |
| 364 | goto err; | 364 | 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, | |||
| 85 | if (j > max) | 85 | if (j > max) |
| 86 | max = j; | 86 | max = j; |
| 87 | } | 87 | } |
| 88 | s = (char *)reallocarray(NULL, max, 2); | 88 | s = reallocarray(NULL, max, 2); |
| 89 | if (s == NULL) { | 89 | if (s == NULL) { |
| 90 | PEMerr(PEM_F_PEM_SEALINIT, ERR_R_MALLOC_FAILURE); | 90 | PEMerr(PEM_F_PEM_SEALINIT, ERR_R_MALLOC_FAILURE); |
| 91 | goto err; | 91 | 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, | |||
| 85 | int i, ret = 0; | 85 | int i, ret = 0; |
| 86 | unsigned int m_len; | 86 | unsigned int m_len; |
| 87 | 87 | ||
| 88 | m = (unsigned char *)malloc(EVP_PKEY_size(pkey) + 2); | 88 | m = malloc(EVP_PKEY_size(pkey) + 2); |
| 89 | if (m == NULL) { | 89 | if (m == NULL) { |
| 90 | PEMerr(PEM_F_PEM_SIGNFINAL, ERR_R_MALLOC_FAILURE); | 90 | PEMerr(PEM_F_PEM_SIGNFINAL, ERR_R_MALLOC_FAILURE); |
| 91 | goto err; | 91 | goto err; |
