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/evp | |
| 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/evp')
| -rw-r--r-- | src/lib/libcrypto/evp/bio_b64.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/evp/bio_enc.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/evp/bio_ok.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/evp/p_lib.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/evp/p_open.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/evp/bio_b64.c b/src/lib/libcrypto/evp/bio_b64.c index 465753cf16..9a08d3356d 100644 --- a/src/lib/libcrypto/evp/bio_b64.c +++ b/src/lib/libcrypto/evp/bio_b64.c | |||
| @@ -113,7 +113,7 @@ b64_new(BIO *bi) | |||
| 113 | { | 113 | { |
| 114 | BIO_B64_CTX *ctx; | 114 | BIO_B64_CTX *ctx; |
| 115 | 115 | ||
| 116 | ctx = (BIO_B64_CTX *)malloc(sizeof(BIO_B64_CTX)); | 116 | ctx = malloc(sizeof(BIO_B64_CTX)); |
| 117 | if (ctx == NULL) | 117 | if (ctx == NULL) |
| 118 | return (0); | 118 | return (0); |
| 119 | 119 | ||
diff --git a/src/lib/libcrypto/evp/bio_enc.c b/src/lib/libcrypto/evp/bio_enc.c index df817b9d8f..965f2ab623 100644 --- a/src/lib/libcrypto/evp/bio_enc.c +++ b/src/lib/libcrypto/evp/bio_enc.c | |||
| @@ -108,7 +108,7 @@ enc_new(BIO *bi) | |||
| 108 | { | 108 | { |
| 109 | BIO_ENC_CTX *ctx; | 109 | BIO_ENC_CTX *ctx; |
| 110 | 110 | ||
| 111 | ctx = (BIO_ENC_CTX *)malloc(sizeof(BIO_ENC_CTX)); | 111 | ctx = malloc(sizeof(BIO_ENC_CTX)); |
| 112 | if (ctx == NULL) | 112 | if (ctx == NULL) |
| 113 | return (0); | 113 | return (0); |
| 114 | EVP_CIPHER_CTX_init(&ctx->cipher); | 114 | EVP_CIPHER_CTX_init(&ctx->cipher); |
diff --git a/src/lib/libcrypto/evp/bio_ok.c b/src/lib/libcrypto/evp/bio_ok.c index 882aaee0fb..3ba40485a2 100644 --- a/src/lib/libcrypto/evp/bio_ok.c +++ b/src/lib/libcrypto/evp/bio_ok.c | |||
| @@ -178,7 +178,7 @@ ok_new(BIO *bi) | |||
| 178 | { | 178 | { |
| 179 | BIO_OK_CTX *ctx; | 179 | BIO_OK_CTX *ctx; |
| 180 | 180 | ||
| 181 | ctx = (BIO_OK_CTX *)malloc(sizeof(BIO_OK_CTX)); | 181 | ctx = malloc(sizeof(BIO_OK_CTX)); |
| 182 | if (ctx == NULL) | 182 | if (ctx == NULL) |
| 183 | return (0); | 183 | return (0); |
| 184 | 184 | ||
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c index 97d922d1ba..b13163b26f 100644 --- a/src/lib/libcrypto/evp/p_lib.c +++ b/src/lib/libcrypto/evp/p_lib.c | |||
| @@ -188,7 +188,7 @@ EVP_PKEY_new(void) | |||
| 188 | { | 188 | { |
| 189 | EVP_PKEY *ret; | 189 | EVP_PKEY *ret; |
| 190 | 190 | ||
| 191 | ret = (EVP_PKEY *)malloc(sizeof(EVP_PKEY)); | 191 | ret = malloc(sizeof(EVP_PKEY)); |
| 192 | if (ret == NULL) { | 192 | if (ret == NULL) { |
| 193 | EVPerr(EVP_F_EVP_PKEY_NEW, ERR_R_MALLOC_FAILURE); | 193 | EVPerr(EVP_F_EVP_PKEY_NEW, ERR_R_MALLOC_FAILURE); |
| 194 | return (NULL); | 194 | return (NULL); |
diff --git a/src/lib/libcrypto/evp/p_open.c b/src/lib/libcrypto/evp/p_open.c index 88c0a45544..c10d7959c3 100644 --- a/src/lib/libcrypto/evp/p_open.c +++ b/src/lib/libcrypto/evp/p_open.c | |||
| @@ -88,7 +88,7 @@ EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, | |||
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | size = RSA_size(priv->pkey.rsa); | 90 | size = RSA_size(priv->pkey.rsa); |
| 91 | key = (unsigned char *)malloc(size + 2); | 91 | key = malloc(size + 2); |
| 92 | if (key == NULL) { | 92 | if (key == NULL) { |
| 93 | /* ERROR */ | 93 | /* ERROR */ |
| 94 | EVPerr(EVP_F_EVP_OPENINIT, ERR_R_MALLOC_FAILURE); | 94 | EVPerr(EVP_F_EVP_OPENINIT, ERR_R_MALLOC_FAILURE); |
