generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change submitted files so that they compile (in particular,

Browse Source 
use BN_CTX_start/get/end instead of accessing ctx->tos).

Change indentation to "EAY" style.
This commit is contained in:
Bodo Möller 2000-11-26 19:20:56 +00:00
parent 946cd9a540
commit 1ec0a3862e
1 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
crypto/bn/bn_mont2.c
View File

@ -21,7 +21,7 @@
#define BN_mask_word(x, m) ((x->d[0]) & (m)) #define BN_mask_word(x, m) ((x->d[0]) & (m))
BN_MONTGOMERY *BN_mont_new() BN_MONTGOMERY *BN_mont_new()
{ {
BN_MONTGOMERY *ret; BN_MONTGOMERY *ret;
ret=(BN_MONTGOMERY *)malloc(sizeof(BN_MONTGOMERY)); ret=(BN_MONTGOMERY *)malloc(sizeof(BN_MONTGOMERY));
@ -29,17 +29,17 @@ BN_MONTGOMERY *BN_mont_new()
if (ret == NULL) return NULL; if (ret == NULL) return NULL;
if ((ret->p = BN_new()) == NULL) if ((ret->p = BN_new()) == NULL)
{ {
free(ret); free(ret);
return NULL; return NULL;
} }
return ret; return ret;
} }
void BN_mont_clear_free(BN_MONTGOMERY *mont) void BN_mont_clear_free(BN_MONTGOMERY *mont)
{ {
if (mont == NULL) return; if (mont == NULL) return;
if (mont->p != NULL) BN_clear_free(mont->p); if (mont->p != NULL) BN_clear_free(mont->p);
@ -47,10 +47,11 @@ void BN_mont_clear_free(BN_MONTGOMERY *mont)
mont->p_num_bytes = 0; mont->p_num_bytes = 0;
mont->R_num_bits = 0; mont->R_num_bits = 0;
mont->p_inv_b_neg = 0; mont->p_inv_b_neg = 0;
} }
int BN_to_mont(BIGNUM *x, BN_MONTGOMERY *mont, BN_CTX *ctx) int BN_to_mont(BIGNUM *x, BN_MONTGOMERY *mont, BN_CTX *ctx)
{ {
assert(x != NULL); assert(x != NULL);
assert(mont != NULL); assert(mont != NULL);
@ -62,12 +63,12 @@ int BN_to_mont(BIGNUM *x, BN_MONTGOMERY *mont, BN_CTX *ctx)
if (!BN_mod(x, x, mont->p, ctx)) return 0; if (!BN_mod(x, x, mont->p, ctx)) return 0;
return 1; return 1;
} }
static BN_ULONG BN_mont_inv(BIGNUM *a, int e, BN_CTX *ctx) static BN_ULONG BN_mont_inv(BIGNUM *a, int e, BN_CTX *ctx)
/* y = a^{-1} (mod 2^e) for an odd number a */ /* y = a^{-1} (mod 2^e) for an odd number a */
{ {
BN_ULONG y, exp, mask; BN_ULONG y, exp, mask;
BIGNUM *x, *xy, *x_sh; BIGNUM *x, *xy, *x_sh;
int i; int i;
@ -84,27 +85,28 @@ static BN_ULONG BN_mont_inv(BIGNUM *a, int e, BN_CTX *ctx)
if((x = BN_dup(a)) == NULL) return 0; if((x = BN_dup(a)) == NULL) return 0;
if(!BN_mask_bits(x, e)) return 0; if(!BN_mask_bits(x, e)) return 0;
xy = ctx->bn[ctx->tos]; BN_CTX_start(ctx);
x_sh = ctx->bn[ctx->tos + 1]; xy = BN_CTX_get(ctx);
ctx->tos += 2; x_sh = BN_CTX_get(ctx);
if (x_sh == NULL) goto err;
if (BN_copy(xy, x) == NULL) goto err; if (BN_copy(xy, x) == NULL) goto err;
if (!BN_lshift1(x_sh, x)) goto err; if (!BN_lshift1(x_sh, x)) goto err;
for (i = 2; i <= e; i++) for (i = 2; i <= e; i++)
{
if (exp < BN_mask_word(xy, mask))
{ {
if (exp < BN_mask_word(xy, mask))
{
y = y + exp; y = y + exp;
if (!BN_add(xy, xy, x_sh)) goto err; if (!BN_add(xy, xy, x_sh)) goto err;
} }
exp <<= 1; exp <<= 1;
if (!BN_lshift1(x_sh, x_sh)) goto err; if (!BN_lshift1(x_sh, x_sh)) goto err;
mask <<= 1; mask <<= 1;
mask++; mask++;
} }
#ifdef TEST #ifdef TEST
@ -112,19 +114,19 @@ static BN_ULONG BN_mont_inv(BIGNUM *a, int e, BN_CTX *ctx)
#endif #endif
if (x != NULL) BN_clear_free(x); if (x != NULL) BN_clear_free(x);
ctx->tos -= 2; BN_CTX_end(ctx);
return y; return y;
err: err:
if (x != NULL) BN_clear_free(x); if (x != NULL) BN_clear_free(x);
ctx->tos -= 2; BN_CTX_end(ctx);
return 0; return 0;
}
}
int BN_mont_set(BIGNUM *p, BN_MONTGOMERY *mont, BN_CTX *ctx) int BN_mont_set(BIGNUM *p, BN_MONTGOMERY *mont, BN_CTX *ctx)
{ {
assert(p != NULL && ctx != NULL); assert(p != NULL && ctx != NULL);
assert(mont != NULL); assert(mont != NULL);
assert(mont->p != NULL); assert(mont->p != NULL);
@ -140,22 +142,23 @@ int BN_mont_set(BIGNUM *p, BN_MONTGOMERY *mont, BN_CTX *ctx)
mont->p_inv_b_neg = 0 - mont->p_inv_b_neg; mont->p_inv_b_neg = 0 - mont->p_inv_b_neg;
return 1; return 1;
} }
static int BN_cpy_mul_word(BIGNUM *ret, BIGNUM *a, BN_ULONG w) static int BN_cpy_mul_word(BIGNUM *ret, BIGNUM *a, BN_ULONG w)
/* ret = a * w */ /* ret = a * w */
{ {
if (BN_copy(ret, a) == NULL) return 0; if (BN_copy(ret, a) == NULL) return 0;
if (!BN_mul_word(ret, w)) return 0; if (!BN_mul_word(ret, w)) return 0;
return 1; return 1;
} }
int BN_mont_red(BIGNUM *y, BN_MONTGOMERY *mont, BN_CTX *ctx) int BN_mont_red(BIGNUM *y, BN_MONTGOMERY *mont, BN_CTX *ctx)
/* yR^{-1} (mod p) */ /* yR^{-1} (mod p) */
{ {
int i; int i;
BIGNUM *up, *p; BIGNUM *up, *p;
BN_ULONG u; BN_ULONG u;
@ -169,12 +172,13 @@ int BN_mont_red(BIGNUM *y, BN_MONTGOMERY *mont, BN_CTX *ctx)
if (BN_is_zero(y)) return 1; if (BN_is_zero(y)) return 1;
p = mont->p; p = mont->p;
up = ctx->bn[ctx->tos];
ctx->tos += 1;
BN_CTX_start(ctx);
up = BN_CTX_get(ctx);
if (up == NULL) goto err;
for (i = 0; i < mont->p_num_bytes; i++) for (i = 0; i < mont->p_num_bytes; i++)
{ {
u = (y->d[0]) * mont->p_inv_b_neg; /* u = y_0 * p' */ u = (y->d[0]) * mont->p_inv_b_neg; /* u = y_0 * p' */
if (!BN_cpy_mul_word(up, p, u)) goto err; /* up = u * p */ if (!BN_cpy_mul_word(up, p, u)) goto err; /* up = u * p */
@ -184,28 +188,27 @@ int BN_mont_red(BIGNUM *y, BN_MONTGOMERY *mont, BN_CTX *ctx)
if (y->d[0]) goto err; if (y->d[0]) goto err;
#endif #endif
if (!BN_rshift(y, y, BN_BITS2)) goto err; /* y = (y + up)/b */ if (!BN_rshift(y, y, BN_BITS2)) goto err; /* y = (y + up)/b */
} }
if (BN_cmp(y, mont->p) >= 0) if (BN_cmp(y, mont->p) >= 0)
{ {
if (!BN_sub(y, y, mont->p)) goto err; if (!BN_sub(y, y, mont->p)) goto err;
} }
ctx->tos -= 1; BN_CTX_end(ctx);
return 1; return 1;
err: err:
ctx->tos -= 1; BN_CTX_end(ctx);
return 0; return 0;
}
}
int BN_mont_mod_mul(BIGNUM *r, BIGNUM *x, BIGNUM *y, BN_MONTGOMERY *mont, BN_CTX *ctx) int BN_mont_mod_mul(BIGNUM *r, BIGNUM *x, BIGNUM *y, BN_MONTGOMERY *mont, BN_CTX *ctx)
/* r = x * y mod p */ /* r = x * y mod p */
/* r != x && r! = y !!! */ /* r != x && r! = y !!! */
{ {
BIGNUM *xiy, *up; BIGNUM *xiy, *up;
BN_ULONG u; BN_ULONG u;
int i; int i;
@ -220,21 +223,22 @@ int BN_mont_mod_mul(BIGNUM *r, BIGNUM *x, BIGNUM *y, BN_MONTGOMERY *mont, BN_CTX
assert(!y->neg); assert(!y->neg);
if (BN_is_zero(x) || BN_is_zero(y)) if (BN_is_zero(x) || BN_is_zero(y))
{ {
if (!BN_zero(r)) return 0; if (!BN_zero(r)) return 0;
return 1; return 1;
} }
xiy = ctx->bn[ctx->tos]; BN_CTX_start(ctx);
up = ctx->bn[ctx->tos + 1]; xiy = BN_CTX_get(ctx);
ctx->tos += 2; up = BN_CTX_get(ctx);
if (up == NULL) goto err;
if (!BN_zero(r)) goto err; if (!BN_zero(r)) goto err;
for (i = 0; i < x->top; i++) for (i = 0; i < x->top; i++)
{ {
u = (r->d[0] + x->d[i] * y->d[0]) * mont->p_inv_b_neg; u = (r->d[0] + x->d[i] * y->d[0]) * mont->p_inv_b_neg;
if (!BN_cpy_mul_word(xiy, y, x->d[i])) goto err; if (!BN_cpy_mul_word(xiy, y, x->d[i])) goto err;
@ -246,11 +250,11 @@ int BN_mont_mod_mul(BIGNUM *r, BIGNUM *x, BIGNUM *y, BN_MONTGOMERY *mont, BN_CTX
#ifdef TEST #ifdef TEST
if (r->d[0]) goto err; if (r->d[0]) goto err;
#endif #endif
if (!BN_rshift(r, r, BN_BITS2)) goto err; if (!BN_rshift(r, r, BN_BITS2)) goto err;
} }
for (i = x->top; i < mont->p_num_bytes; i++) for (i = x->top; i < mont->p_num_bytes; i++)
{ {
u = (r->d[0]) * mont->p_inv_b_neg; u = (r->d[0]) * mont->p_inv_b_neg;
if (!BN_cpy_mul_word(up, mont->p, u)) goto err; if (!BN_cpy_mul_word(up, mont->p, u)) goto err;
@ -260,20 +264,20 @@ int BN_mont_mod_mul(BIGNUM *r, BIGNUM *x, BIGNUM *y, BN_MONTGOMERY *mont, BN_CTX
#ifdef TEST #ifdef TEST
if (r->d[0]) goto err; if (r->d[0]) goto err;
#endif #endif
if (!BN_rshift(r, r, BN_BITS2)) goto err; if (!BN_rshift(r, r, BN_BITS2)) goto err;
} }
if (BN_cmp(r, mont->p) >= 0) if (BN_cmp(r, mont->p) >= 0)
{ {
if (!BN_sub(r, r, mont->p)) goto err; if (!BN_sub(r, r, mont->p)) goto err;
} }
ctx->tos -= 2; BN_CTX_end(ctx);
return 1; return 1;
err: err:
ctx->tos -= 2; BN_CTX_end(ctx);
return 0; return 0;
} }