summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2025-01-08 20:12:18 +0000
committertb <>2025-01-08 20:12:18 +0000
commiteb889d1fdad930608fba5130934a70887d22e1c0 (patch)
treea6c999a2d5ef807d4e15ad7363dc61f185904bfd
parent1870f999e6a7e02bf465e0576d250fb7fcf6e751 (diff)
downloadopenbsd-eb889d1fdad930608fba5130934a70887d22e1c0.tar.gz
openbsd-eb889d1fdad930608fba5130934a70887d22e1c0.tar.bz2
openbsd-eb889d1fdad930608fba5130934a70887d22e1c0.zip
Remove superfluous parentheses
-rw-r--r--src/lib/libcrypto/bn/bn_recp.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libcrypto/bn/bn_recp.c b/src/lib/libcrypto/bn/bn_recp.c
index c9a83f8489..1658a13823 100644
--- a/src/lib/libcrypto/bn/bn_recp.c
+++ b/src/lib/libcrypto/bn/bn_recp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bn_recp.c,v 1.21 2025/01/06 13:47:37 tb Exp $ */ 1/* $OpenBSD: bn_recp.c,v 1.22 2025/01/08 20:12:18 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -65,8 +65,8 @@
65void 65void
66BN_RECP_CTX_init(BN_RECP_CTX *recp) 66BN_RECP_CTX_init(BN_RECP_CTX *recp)
67{ 67{
68 BN_init(&(recp->N)); 68 BN_init(&recp->N);
69 BN_init(&(recp->Nr)); 69 BN_init(&recp->Nr);
70 recp->num_bits = 0; 70 recp->num_bits = 0;
71 recp->flags = 0; 71 recp->flags = 0;
72} 72}
@@ -90,8 +90,8 @@ BN_RECP_CTX_free(BN_RECP_CTX *recp)
90 if (recp == NULL) 90 if (recp == NULL)
91 return; 91 return;
92 92
93 BN_free(&(recp->N)); 93 BN_free(&recp->N);
94 BN_free(&(recp->Nr)); 94 BN_free(&recp->Nr);
95 if (recp->flags & BN_FLG_MALLOCED) 95 if (recp->flags & BN_FLG_MALLOCED)
96 free(recp); 96 free(recp);
97} 97}
@@ -99,9 +99,9 @@ BN_RECP_CTX_free(BN_RECP_CTX *recp)
99int 99int
100BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *d, BN_CTX *ctx) 100BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *d, BN_CTX *ctx)
101{ 101{
102 if (!bn_copy(&(recp->N), d)) 102 if (!bn_copy(&recp->N, d))
103 return 0; 103 return 0;
104 BN_zero(&(recp->Nr)); 104 BN_zero(&recp->Nr);
105 recp->num_bits = BN_num_bits(d); 105 recp->num_bits = BN_num_bits(d);
106 recp->shift = 0; 106 recp->shift = 0;
107 return (1); 107 return (1);
@@ -156,7 +156,7 @@ BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, BN_RECP_CTX *recp,
156 if (a == NULL || b == NULL || d == NULL || r == NULL) 156 if (a == NULL || b == NULL || d == NULL || r == NULL)
157 goto err; 157 goto err;
158 158
159 if (BN_ucmp(m, &(recp->N)) < 0) { 159 if (BN_ucmp(m, &recp->N) < 0) {
160 BN_zero(d); 160 BN_zero(d);
161 if (!bn_copy(r, m)) { 161 if (!bn_copy(r, m)) {
162 BN_CTX_end(ctx); 162 BN_CTX_end(ctx);
@@ -180,7 +180,7 @@ BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, BN_RECP_CTX *recp,
180 180
181 /* Nr := round(2^i / N) */ 181 /* Nr := round(2^i / N) */
182 if (i != recp->shift) 182 if (i != recp->shift)
183 recp->shift = BN_reciprocal(&(recp->Nr), &(recp->N), i, ctx); 183 recp->shift = BN_reciprocal(&recp->Nr, &recp->N, i, ctx);
184 184
185 /* BN_reciprocal returns i, or -1 for an error */ 185 /* BN_reciprocal returns i, or -1 for an error */
186 if (recp->shift == -1) 186 if (recp->shift == -1)
@@ -193,13 +193,13 @@ BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, BN_RECP_CTX *recp,
193 */ 193 */
194 if (!BN_rshift(a, m, recp->num_bits)) 194 if (!BN_rshift(a, m, recp->num_bits))
195 goto err; 195 goto err;
196 if (!BN_mul(b, a,&(recp->Nr), ctx)) 196 if (!BN_mul(b, a,&recp->Nr, ctx))
197 goto err; 197 goto err;
198 if (!BN_rshift(d, b, i - recp->num_bits)) 198 if (!BN_rshift(d, b, i - recp->num_bits))
199 goto err; 199 goto err;
200 d->neg = 0; 200 d->neg = 0;
201 201
202 if (!BN_mul(b, &(recp->N), d, ctx)) 202 if (!BN_mul(b, &recp->N, d, ctx))
203 goto err; 203 goto err;
204 if (!BN_usub(r, m, b)) 204 if (!BN_usub(r, m, b))
205 goto err; 205 goto err;
@@ -207,12 +207,12 @@ BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, BN_RECP_CTX *recp,
207 207
208#if 1 208#if 1
209 j = 0; 209 j = 0;
210 while (BN_ucmp(r, &(recp->N)) >= 0) { 210 while (BN_ucmp(r, &recp->N) >= 0) {
211 if (j++ > 2) { 211 if (j++ > 2) {
212 BNerror(BN_R_BAD_RECIPROCAL); 212 BNerror(BN_R_BAD_RECIPROCAL);
213 goto err; 213 goto err;
214 } 214 }
215 if (!BN_usub(r, r, &(recp->N))) 215 if (!BN_usub(r, r, &recp->N))
216 goto err; 216 goto err;
217 if (!BN_add_word(d, 1)) 217 if (!BN_add_word(d, 1))
218 goto err; 218 goto err;