diff options
| author | tb <> | 2023-08-02 08:50:02 +0000 |
|---|---|---|
| committer | tb <> | 2023-08-02 08:50:02 +0000 |
| commit | a4c381042d50290d3d3c32d528ef2b0acaf28aae (patch) | |
| tree | 5dfa1c04f4860462cc39a5b3ef0857bc912d9875 /src | |
| parent | 0a5b92c72e6db90ab62220b775b714885b4dbb12 (diff) | |
| download | openbsd-a4c381042d50290d3d3c32d528ef2b0acaf28aae.tar.gz openbsd-a4c381042d50290d3d3c32d528ef2b0acaf28aae.tar.bz2 openbsd-a4c381042d50290d3d3c32d528ef2b0acaf28aae.zip | |
Remove extraneous parentheses and fix weird whitespace.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/bn/bn_blind.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/lib/libcrypto/bn/bn_blind.c b/src/lib/libcrypto/bn/bn_blind.c index 93a64dbfed..f40a7198c8 100644 --- a/src/lib/libcrypto/bn/bn_blind.c +++ b/src/lib/libcrypto/bn/bn_blind.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bn_blind.c,v 1.30 2023/08/02 08:44:38 tb Exp $ */ | 1 | /* $OpenBSD: bn_blind.c,v 1.31 2023/08/02 08:50:02 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -136,10 +136,9 @@ BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod) | |||
| 136 | { | 136 | { |
| 137 | BN_BLINDING *ret = NULL; | 137 | BN_BLINDING *ret = NULL; |
| 138 | 138 | ||
| 139 | |||
| 140 | if ((ret = calloc(1, sizeof(BN_BLINDING))) == NULL) { | 139 | if ((ret = calloc(1, sizeof(BN_BLINDING))) == NULL) { |
| 141 | BNerror(ERR_R_MALLOC_FAILURE); | 140 | BNerror(ERR_R_MALLOC_FAILURE); |
| 142 | return (NULL); | 141 | return NULL; |
| 143 | } | 142 | } |
| 144 | if (A != NULL) { | 143 | if (A != NULL) { |
| 145 | if ((ret->A = BN_dup(A)) == NULL) | 144 | if ((ret->A = BN_dup(A)) == NULL) |
| @@ -163,10 +162,11 @@ BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod) | |||
| 163 | CRYPTO_THREADID_current(&ret->tid); | 162 | CRYPTO_THREADID_current(&ret->tid); |
| 164 | return (ret); | 163 | return (ret); |
| 165 | 164 | ||
| 166 | err: | 165 | err: |
| 167 | if (ret != NULL) | 166 | if (ret != NULL) |
| 168 | BN_BLINDING_free(ret); | 167 | BN_BLINDING_free(ret); |
| 169 | return (NULL); | 168 | |
| 169 | return NULL; | ||
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | void | 172 | void |
| @@ -187,7 +187,7 @@ BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx) | |||
| 187 | { | 187 | { |
| 188 | int ret = 0; | 188 | int ret = 0; |
| 189 | 189 | ||
| 190 | if ((b->A == NULL) || (b->Ai == NULL)) { | 190 | if (b->A == NULL || b->Ai == NULL) { |
| 191 | BNerror(BN_R_NOT_INITIALIZED); | 191 | BNerror(BN_R_NOT_INITIALIZED); |
| 192 | goto err; | 192 | goto err; |
| 193 | } | 193 | } |
| @@ -208,10 +208,11 @@ BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx) | |||
| 208 | 208 | ||
| 209 | ret = 1; | 209 | ret = 1; |
| 210 | 210 | ||
| 211 | err: | 211 | err: |
| 212 | if (b->counter == BN_BLINDING_COUNTER) | 212 | if (b->counter == BN_BLINDING_COUNTER) |
| 213 | b->counter = 0; | 213 | b->counter = 0; |
| 214 | return (ret); | 214 | |
| 215 | return ret; | ||
| 215 | } | 216 | } |
| 216 | 217 | ||
| 217 | int | 218 | int |
| @@ -219,17 +220,16 @@ BN_BLINDING_convert(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) | |||
| 219 | { | 220 | { |
| 220 | int ret = 1; | 221 | int ret = 1; |
| 221 | 222 | ||
| 222 | 223 | if (b->A == NULL || b->Ai == NULL) { | |
| 223 | if ((b->A == NULL) || (b->Ai == NULL)) { | ||
| 224 | BNerror(BN_R_NOT_INITIALIZED); | 224 | BNerror(BN_R_NOT_INITIALIZED); |
| 225 | return (0); | 225 | return 0; |
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | if (b->counter == -1) | 228 | if (b->counter == -1) |
| 229 | /* Fresh blinding, doesn't need updating. */ | 229 | /* Fresh blinding, doesn't need updating. */ |
| 230 | b->counter = 0; | 230 | b->counter = 0; |
| 231 | else if (!BN_BLINDING_update(b, ctx)) | 231 | else if (!BN_BLINDING_update(b, ctx)) |
| 232 | return (0); | 232 | return 0; |
| 233 | 233 | ||
| 234 | if (r != NULL) { | 234 | if (r != NULL) { |
| 235 | if (!bn_copy(r, b->Ai)) | 235 | if (!bn_copy(r, b->Ai)) |
| @@ -247,7 +247,6 @@ BN_BLINDING_invert(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) | |||
| 247 | { | 247 | { |
| 248 | int ret; | 248 | int ret; |
| 249 | 249 | ||
| 250 | |||
| 251 | if (r != NULL) | 250 | if (r != NULL) |
| 252 | ret = BN_mod_mul(n, n, r, b->mod, ctx); | 251 | ret = BN_mod_mul(n, n, r, b->mod, ctx); |
| 253 | else { | 252 | else { |
| @@ -258,7 +257,7 @@ BN_BLINDING_invert(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) | |||
| 258 | ret = BN_mod_mul(n, n, b->Ai, b->mod, ctx); | 257 | ret = BN_mod_mul(n, n, b->Ai, b->mod, ctx); |
| 259 | } | 258 | } |
| 260 | 259 | ||
| 261 | return (ret); | 260 | return ret; |
| 262 | } | 261 | } |
| 263 | 262 | ||
| 264 | CRYPTO_THREADID * | 263 | CRYPTO_THREADID * |
| @@ -272,8 +271,8 @@ BN_BLINDING_create_param(BN_BLINDING *b, const BIGNUM *e, BIGNUM *m, | |||
| 272 | BN_CTX *ctx, int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, | 271 | BN_CTX *ctx, int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, |
| 273 | const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx), BN_MONT_CTX *m_ctx) | 272 | const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx), BN_MONT_CTX *m_ctx) |
| 274 | { | 273 | { |
| 275 | int retry_counter = 32; | ||
| 276 | BN_BLINDING *ret = NULL; | 274 | BN_BLINDING *ret = NULL; |
| 275 | int retry_counter = 32; | ||
| 277 | 276 | ||
| 278 | if (b == NULL) | 277 | if (b == NULL) |
| 279 | ret = BN_BLINDING_new(NULL, NULL, m); | 278 | ret = BN_BLINDING_new(NULL, NULL, m); |
| @@ -329,7 +328,7 @@ BN_BLINDING_create_param(BN_BLINDING *b, const BIGNUM *e, BIGNUM *m, | |||
| 329 | 328 | ||
| 330 | return ret; | 329 | return ret; |
| 331 | 330 | ||
| 332 | err: | 331 | err: |
| 333 | if (b == NULL && ret != NULL) { | 332 | if (b == NULL && ret != NULL) { |
| 334 | BN_BLINDING_free(ret); | 333 | BN_BLINDING_free(ret); |
| 335 | ret = NULL; | 334 | ret = NULL; |
