diff options
| author | deraadt <> | 2014-06-07 14:41:57 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-06-07 14:41:57 +0000 |
| commit | 6e812251158ecbc0733dba21489ebce1248ebb33 (patch) | |
| tree | c0956c22011ba4358ae4ab650adf0e744f93f40c /src/lib/libcrypto/bn | |
| parent | 369f4c90b9a7f7864572479745455d29b0777219 (diff) | |
| download | openbsd-6e812251158ecbc0733dba21489ebce1248ebb33.tar.gz openbsd-6e812251158ecbc0733dba21489ebce1248ebb33.tar.bz2 openbsd-6e812251158ecbc0733dba21489ebce1248ebb33.zip | |
malloc() result does not need a cast.
ok miod
Diffstat (limited to 'src/lib/libcrypto/bn')
| -rw-r--r-- | src/lib/libcrypto/bn/bn_exp.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/bn_mont.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/bn_print.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/bn_rand.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/bn_recp.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/bn/bn_exp.c b/src/lib/libcrypto/bn/bn_exp.c index a27373c97b..af88798eff 100644 --- a/src/lib/libcrypto/bn/bn_exp.c +++ b/src/lib/libcrypto/bn/bn_exp.c | |||
| @@ -627,7 +627,7 @@ BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, | |||
| 627 | numPowers = 1 << window; | 627 | numPowers = 1 << window; |
| 628 | powerbufLen = sizeof(m->d[0]) * (top * numPowers + | 628 | powerbufLen = sizeof(m->d[0]) * (top * numPowers + |
| 629 | ((2*top) > numPowers ? (2*top) : numPowers)); | 629 | ((2*top) > numPowers ? (2*top) : numPowers)); |
| 630 | if ((powerbufFree = (unsigned char*)malloc(powerbufLen + | 630 | if ((powerbufFree = malloc(powerbufLen + |
| 631 | MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH)) == NULL) | 631 | MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH)) == NULL) |
| 632 | goto err; | 632 | goto err; |
| 633 | 633 | ||
diff --git a/src/lib/libcrypto/bn/bn_mont.c b/src/lib/libcrypto/bn/bn_mont.c index 073dfeffee..af7b083530 100644 --- a/src/lib/libcrypto/bn/bn_mont.c +++ b/src/lib/libcrypto/bn/bn_mont.c | |||
| @@ -325,7 +325,7 @@ BN_MONT_CTX_new(void) | |||
| 325 | { | 325 | { |
| 326 | BN_MONT_CTX *ret; | 326 | BN_MONT_CTX *ret; |
| 327 | 327 | ||
| 328 | if ((ret = (BN_MONT_CTX *)malloc(sizeof(BN_MONT_CTX))) == NULL) | 328 | if ((ret = malloc(sizeof(BN_MONT_CTX))) == NULL) |
| 329 | return (NULL); | 329 | return (NULL); |
| 330 | 330 | ||
| 331 | BN_MONT_CTX_init(ret); | 331 | BN_MONT_CTX_init(ret); |
diff --git a/src/lib/libcrypto/bn/bn_print.c b/src/lib/libcrypto/bn/bn_print.c index ad3a847f01..4685389bf8 100644 --- a/src/lib/libcrypto/bn/bn_print.c +++ b/src/lib/libcrypto/bn/bn_print.c | |||
| @@ -72,7 +72,7 @@ BN_bn2hex(const BIGNUM *a) | |||
| 72 | char *buf; | 72 | char *buf; |
| 73 | char *p; | 73 | char *p; |
| 74 | 74 | ||
| 75 | buf = (char *)malloc(a->top * BN_BYTES * 2 + 2); | 75 | buf = malloc(a->top * BN_BYTES * 2 + 2); |
| 76 | if (buf == NULL) { | 76 | if (buf == NULL) { |
| 77 | BNerr(BN_F_BN_BN2HEX, ERR_R_MALLOC_FAILURE); | 77 | BNerr(BN_F_BN_BN2HEX, ERR_R_MALLOC_FAILURE); |
| 78 | goto err; | 78 | goto err; |
| @@ -117,7 +117,7 @@ BN_bn2dec(const BIGNUM *a) | |||
| 117 | i = BN_num_bits(a) * 3; | 117 | i = BN_num_bits(a) * 3; |
| 118 | num = (i / 10 + i / 1000 + 1) + 1; | 118 | num = (i / 10 + i / 1000 + 1) + 1; |
| 119 | bn_data = reallocarray(NULL, num / BN_DEC_NUM + 1, sizeof(BN_ULONG)); | 119 | bn_data = reallocarray(NULL, num / BN_DEC_NUM + 1, sizeof(BN_ULONG)); |
| 120 | buf = (char *)malloc(num + 3); | 120 | buf = malloc(num + 3); |
| 121 | if ((buf == NULL) || (bn_data == NULL)) { | 121 | if ((buf == NULL) || (bn_data == NULL)) { |
| 122 | BNerr(BN_F_BN_BN2DEC, ERR_R_MALLOC_FAILURE); | 122 | BNerr(BN_F_BN_BN2DEC, ERR_R_MALLOC_FAILURE); |
| 123 | goto err; | 123 | goto err; |
diff --git a/src/lib/libcrypto/bn/bn_rand.c b/src/lib/libcrypto/bn/bn_rand.c index 488b7c6e63..0073eec35c 100644 --- a/src/lib/libcrypto/bn/bn_rand.c +++ b/src/lib/libcrypto/bn/bn_rand.c | |||
| @@ -130,7 +130,7 @@ bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom) | |||
| 130 | bit = (bits - 1) % 8; | 130 | bit = (bits - 1) % 8; |
| 131 | mask = 0xff << (bit + 1); | 131 | mask = 0xff << (bit + 1); |
| 132 | 132 | ||
| 133 | buf = (unsigned char *)malloc(bytes); | 133 | buf = malloc(bytes); |
| 134 | if (buf == NULL) { | 134 | if (buf == NULL) { |
| 135 | BNerr(BN_F_BNRAND, ERR_R_MALLOC_FAILURE); | 135 | BNerr(BN_F_BNRAND, ERR_R_MALLOC_FAILURE); |
| 136 | goto err; | 136 | goto err; |
diff --git a/src/lib/libcrypto/bn/bn_recp.c b/src/lib/libcrypto/bn/bn_recp.c index 31fe4eb897..89d6bd480d 100644 --- a/src/lib/libcrypto/bn/bn_recp.c +++ b/src/lib/libcrypto/bn/bn_recp.c | |||
| @@ -74,7 +74,7 @@ BN_RECP_CTX_new(void) | |||
| 74 | { | 74 | { |
| 75 | BN_RECP_CTX *ret; | 75 | BN_RECP_CTX *ret; |
| 76 | 76 | ||
| 77 | if ((ret = (BN_RECP_CTX *)malloc(sizeof(BN_RECP_CTX))) == NULL) | 77 | if ((ret = malloc(sizeof(BN_RECP_CTX))) == NULL) |
| 78 | return (NULL); | 78 | return (NULL); |
| 79 | 79 | ||
| 80 | BN_RECP_CTX_init(ret); | 80 | BN_RECP_CTX_init(ret); |
