cryb.to/cryb-to
1
0
Fork 0
mirror of https://github.com/cryb-to/cryb-to.git synced 2024-11-21 21:25:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10 from cryb-to/cryb-mpi

Browse source 
Fix equality predicates.
This commit is contained in:
Dag-Erling Smørgrav 2017-04-22 06:03:03 +02:00 committed by GitHub
commit a610b40c7b
7 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/mpi/cryb_mpi_add_abs.c
View file

@ -92,7 +92,7 @@ mpi_add_abs(cryb_mpi *X, const cryb_mpi *A, const cryb_mpi *B)
*/
/* add B into X word by word until we run out of B */
for (c = i = 0; i < (B->msb + 31) / 32; ++i) {
for (c = i = 0; i < MPI_MSW(B); ++i) {
X->words[i] += c;
c = (X->words[i] < c);
X->words[i] += B->words[i];

2
lib/mpi/cryb_mpi_eq.c
View file

@ -47,5 +47,5 @@ mpi_eq(const cryb_mpi *A, const cryb_mpi *B)
return (1);
if (A->neg != B->neg || A->msb != B->msb)
return (0);
return (memcmp(A->words, B->words, (A->msb + 31) / 32) == 0);
return (memcmp(A->words, B->words, MPI_MSW(A) * 4) == 0);
}

2
lib/mpi/cryb_mpi_eq_abs.c
View file

@ -47,5 +47,5 @@ mpi_eq_abs(const cryb_mpi *A, const cryb_mpi *B)
return (1);
if (A->msb != B->msb)
return (0);
return (memcmp(A->words, B->words, (A->msb + 31) / 32) == 0);
return (memcmp(A->words, B->words, MPI_MSW(A) * 4) == 0);
}

3
lib/mpi/cryb_mpi_impl.h
View file

@ -30,6 +30,9 @@
/* n rounded up to nearest multiple of p */
#define RUP(n, p) ((((n) + (p) - 1) / (p)) * (p))
/* one-based index of the most significant word of an mpi */
#define MPI_MSW(n) (((n)->msb + 31) / 32)
/*
* Initialize an all-zeroes mpi.
*/

4
lib/mpi/cryb_mpi_mul_abs.c
View file

@ -72,8 +72,8 @@ mpi_mul_abs(cryb_mpi *X, const cryb_mpi *A, const cryb_mpi *B)
*/
P = (X == A || X == B) ? &T : X;
mpi_zero(P);
a = (A->msb + 31) / 32;
b = (B->msb + 31) / 32;
a = MPI_MSW(A);
b = MPI_MSW(B);
if (mpi_grow(P, (a + b) * 32) != 0)
return (-1);

2
lib/mpi/cryb_mpi_sub_abs.c
View file

@ -81,7 +81,7 @@ mpi_sub_abs(cryb_mpi *X, const cryb_mpi *A, const cryb_mpi *B)
return (-1);
/* subtract L from G word by word until we run out of L */
for (c = i = 0; i < (L->msb + 31) / 32; ++i) {
for (c = i = 0; i < MPI_MSW(L); ++i) {
cn = G->words[i] < c ||
G->words[i] - c < L->words[i];
X->words[i] = G->words[i] - L->words[i] - c;

4
t/t_mpi_compar.c
View file

@ -107,6 +107,10 @@ static struct t_cmp_case {
{ "3 > 1", 3, 1, 1 },
{ "3 > 2", 3, 2, 1 },
{ "3 == 3", 3, 3, 0 },
/* 0x200 and 0x300: same msb, identical lowest byte */
{ "512 < 768", 512, 768, -1 },
{ "768 > 512", 768, 512, 1 },
};
/*