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/ec | |
| 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/ec')
| -rw-r--r-- | src/lib/libcrypto/ec/ec_ameth.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/ec/ec_key.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/ec/ec_mult.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/ec/ec_print.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/ec/ecp_nistp224.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/ec/ecp_nistp256.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/ec/ecp_nistp521.c | 2 |
7 files changed, 7 insertions, 7 deletions
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) | |||
| 325 | ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); | 325 | ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); |
| 326 | return 0; | 326 | return 0; |
| 327 | } | 327 | } |
| 328 | ep = (unsigned char *) malloc(eplen); | 328 | ep = malloc(eplen); |
| 329 | if (!ep) { | 329 | if (!ep) { |
| 330 | EC_KEY_set_enc_flags(ec_key, old_flags); | 330 | EC_KEY_set_enc_flags(ec_key, old_flags); |
| 331 | ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_MALLOC_FAILURE); | 331 | 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) | |||
| 70 | { | 70 | { |
| 71 | EC_KEY *ret; | 71 | EC_KEY *ret; |
| 72 | 72 | ||
| 73 | ret = (EC_KEY *) malloc(sizeof(EC_KEY)); | 73 | ret = malloc(sizeof(EC_KEY)); |
| 74 | if (ret == NULL) { | 74 | if (ret == NULL) { |
| 75 | ECerr(EC_F_EC_KEY_NEW, ERR_R_MALLOC_FAILURE); | 75 | ECerr(EC_F_EC_KEY_NEW, ERR_R_MALLOC_FAILURE); |
| 76 | return (NULL); | 76 | 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) | |||
| 105 | if (!group) | 105 | if (!group) |
| 106 | return NULL; | 106 | return NULL; |
| 107 | 107 | ||
| 108 | ret = (EC_PRE_COMP *) malloc(sizeof(EC_PRE_COMP)); | 108 | ret = malloc(sizeof(EC_PRE_COMP)); |
| 109 | if (!ret) { | 109 | if (!ret) { |
| 110 | ECerr(EC_F_EC_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE); | 110 | ECerr(EC_F_EC_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE); |
| 111 | return ret; | 111 | 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, | |||
| 141 | free(buf); | 141 | free(buf); |
| 142 | return NULL; | 142 | return NULL; |
| 143 | } | 143 | } |
| 144 | ret = (char *) malloc(buf_len * 2 + 2); | 144 | ret = malloc(buf_len * 2 + 2); |
| 145 | if (ret == NULL) { | 145 | if (ret == NULL) { |
| 146 | free(buf); | 146 | free(buf); |
| 147 | return NULL; | 147 | 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 * | |||
| 1188 | nistp224_pre_comp_new() | 1188 | nistp224_pre_comp_new() |
| 1189 | { | 1189 | { |
| 1190 | NISTP224_PRE_COMP *ret = NULL; | 1190 | NISTP224_PRE_COMP *ret = NULL; |
| 1191 | ret = (NISTP224_PRE_COMP *) malloc(sizeof *ret); | 1191 | ret = malloc(sizeof *ret); |
| 1192 | if (!ret) { | 1192 | if (!ret) { |
| 1193 | ECerr(EC_F_NISTP224_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE); | 1193 | ECerr(EC_F_NISTP224_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE); |
| 1194 | return ret; | 1194 | 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 * | |||
| 1737 | nistp256_pre_comp_new() | 1737 | nistp256_pre_comp_new() |
| 1738 | { | 1738 | { |
| 1739 | NISTP256_PRE_COMP *ret = NULL; | 1739 | NISTP256_PRE_COMP *ret = NULL; |
| 1740 | ret = (NISTP256_PRE_COMP *) malloc(sizeof *ret); | 1740 | ret = malloc(sizeof *ret); |
| 1741 | if (!ret) { | 1741 | if (!ret) { |
| 1742 | ECerr(EC_F_NISTP256_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE); | 1742 | ECerr(EC_F_NISTP256_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE); |
| 1743 | return ret; | 1743 | 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 * | |||
| 1628 | nistp521_pre_comp_new() | 1628 | nistp521_pre_comp_new() |
| 1629 | { | 1629 | { |
| 1630 | NISTP521_PRE_COMP *ret = NULL; | 1630 | NISTP521_PRE_COMP *ret = NULL; |
| 1631 | ret = (NISTP521_PRE_COMP *) malloc(sizeof(NISTP521_PRE_COMP)); | 1631 | ret = malloc(sizeof(NISTP521_PRE_COMP)); |
| 1632 | if (!ret) { | 1632 | if (!ret) { |
| 1633 | ECerr(EC_F_NISTP521_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE); | 1633 | ECerr(EC_F_NISTP521_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE); |
| 1634 | return ret; | 1634 | return ret; |
