Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
nettle
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dmitry Baryshkov
nettle
Commits
eab7abff
Commit
eab7abff
authored
Sep 22, 2014
by
Niels Möller
Browse files
Options
Downloads
Patches
Plain Diff
Simplified ecc-mod-test.
parent
b524402c
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+5
-0
5 additions, 0 deletions
ChangeLog
testsuite/ecc-mod-test.c
+32
-64
32 additions, 64 deletions
testsuite/ecc-mod-test.c
with
37 additions
and
64 deletions
ChangeLog
+
5
−
0
View file @
eab7abff
2014-09-22 Niels Möller <nisse@lysator.liu.se>
2014-09-22 Niels Möller <nisse@lysator.liu.se>
* testsuite/ecc-mod-test.c (test_modulo): New function, testing
one modulo. Replacing...
(test_curve): ... old function.
(test_main): Invoke test_modulo for p and q of each curve.
* ecc-internal.h (ecc_mod_inv_func): New typedef.
* ecc-internal.h (ecc_mod_inv_func): New typedef.
(struct ecc_modulo): Added mp1h constant and invert function
(struct ecc_modulo): Added mp1h constant and invert function
pointer. Updated all callers.
pointer. Updated all callers.
...
...
This diff is collapsed.
Click to expand it.
testsuite/ecc-mod-test.c
+
32
−
64
View file @
eab7abff
...
@@ -20,10 +20,11 @@ ref_mod (mp_limb_t *rp, const mp_limb_t *ap, const mp_limb_t *mp, mp_size_t mn)
...
@@ -20,10 +20,11 @@ ref_mod (mp_limb_t *rp, const mp_limb_t *ap, const mp_limb_t *mp, mp_size_t mn)
#define COUNT 50000
#define COUNT 50000
static
void
static
void
test_curve
(
gmp_randstate_t
rands
,
const
struct
ecc_curve
*
ecc
)
test_modulo
(
gmp_randstate_t
rands
,
const
char
*
name
,
const
struct
ecc_modulo
*
m
)
{
{
mp_limb_t
a
[
MAX_SIZE
];
mp_limb_t
a
[
MAX_SIZE
];
mp_limb_t
m
[
MAX_SIZE
];
mp_limb_t
t
[
MAX_SIZE
];
mp_limb_t
ref
[
MAX_SIZE
];
mp_limb_t
ref
[
MAX_SIZE
];
mpz_t
r
;
mpz_t
r
;
unsigned
j
;
unsigned
j
;
...
@@ -33,77 +34,43 @@ test_curve (gmp_randstate_t rands, const struct ecc_curve *ecc)
...
@@ -33,77 +34,43 @@ test_curve (gmp_randstate_t rands, const struct ecc_curve *ecc)
for
(
j
=
0
;
j
<
COUNT
;
j
++
)
for
(
j
=
0
;
j
<
COUNT
;
j
++
)
{
{
if
(
j
&
1
)
if
(
j
&
1
)
mpz_rrandomb
(
r
,
rands
,
2
*
ecc
->
p
.
size
*
GMP_NUMB_BITS
);
mpz_rrandomb
(
r
,
rands
,
2
*
m
->
size
*
GMP_NUMB_BITS
);
else
else
mpz_urandomb
(
r
,
rands
,
2
*
ecc
->
p
.
size
*
GMP_NUMB_BITS
);
mpz_urandomb
(
r
,
rands
,
2
*
m
->
size
*
GMP_NUMB_BITS
);
mpz_limbs_copy
(
a
,
r
,
2
*
ecc
->
p
.
size
);
mpz_limbs_copy
(
a
,
r
,
2
*
m
->
size
);
ref_mod
(
ref
,
a
,
ecc
->
p
.
m
,
ecc
->
p
.
size
);
ref_mod
(
ref
,
a
,
m
->
m
,
m
->
size
);
mpn_copyi
(
m
,
a
,
2
*
ecc
->
p
.
size
);
mpn_copyi
(
t
,
a
,
2
*
m
->
size
);
ecc
->
p
.
mod
(
&
ecc
->
p
,
m
);
m
->
mod
(
m
,
t
);
if
(
mpn_cmp
(
m
,
ecc
->
p
.
m
,
ecc
->
p
.
size
)
>=
0
)
if
(
mpn_cmp
(
t
,
m
->
m
,
m
->
size
)
>=
0
)
mpn_sub_n
(
m
,
m
,
ecc
->
p
.
m
,
ecc
->
p
.
size
);
mpn_sub_n
(
t
,
t
,
m
->
m
,
m
->
size
);
if
(
mpn_cmp
(
m
,
ref
,
ecc
->
p
.
size
))
if
(
mpn_cmp
(
t
,
ref
,
m
->
size
))
{
{
fprintf
(
stderr
,
"
ecc
->mod
p
failed: bit_size = %u
\n
"
,
fprintf
(
stderr
,
"
m
->mod
%s
failed: bit_size = %u
\n
"
,
ecc
->
p
.
bit_size
);
name
,
m
->
bit_size
);
gmp_fprintf
(
stderr
,
"a = %Nx
\n
"
,
a
,
2
*
ecc
->
p
.
size
);
gmp_fprintf
(
stderr
,
"a = %Nx
\n
"
,
a
,
2
*
m
->
size
);
gmp_fprintf
(
stderr
,
"
m
= %Nx (bad)
\n
"
,
m
,
ecc
->
p
.
size
);
gmp_fprintf
(
stderr
,
"
t
= %Nx (bad)
\n
"
,
t
,
m
->
size
);
gmp_fprintf
(
stderr
,
"ref = %Nx
\n
"
,
ref
,
ecc
->
p
.
size
);
gmp_fprintf
(
stderr
,
"ref = %Nx
\n
"
,
ref
,
m
->
size
);
abort
();
abort
();
}
}
if
(
ecc
->
p
.
B_size
<
ecc
->
p
.
size
)
if
(
m
->
B_size
<
m
->
size
)
{
{
mpn_copyi
(
m
,
a
,
2
*
ecc
->
p
.
size
);
mpn_copyi
(
t
,
a
,
2
*
m
->
size
);
ecc_mod
(
&
ecc
->
p
,
m
);
ecc_mod
(
m
,
t
);
if
(
mpn_cmp
(
m
,
ecc
->
p
.
m
,
ecc
->
p
.
size
)
>=
0
)
if
(
mpn_cmp
(
t
,
m
->
m
,
m
->
size
)
>=
0
)
mpn_sub_n
(
m
,
m
,
ecc
->
p
.
m
,
ecc
->
p
.
size
);
mpn_sub_n
(
t
,
t
,
m
->
m
,
m
->
size
);
if
(
mpn_cmp
(
m
,
ref
,
ecc
->
p
.
size
))
if
(
mpn_cmp
(
t
,
ref
,
m
->
size
))
{
{
fprintf
(
stderr
,
"ecc_generic_modp failed: bit_size = %u
\n
"
,
fprintf
(
stderr
,
"ecc_mod %s failed: bit_size = %u
\n
"
,
ecc
->
p
.
bit_size
);
name
,
m
->
bit_size
);
gmp_fprintf
(
stderr
,
"a = %Nx
\n
"
,
a
,
2
*
ecc
->
p
.
size
);
gmp_fprintf
(
stderr
,
"a = %Nx
\n
"
,
a
,
2
*
m
->
size
);
gmp_fprintf
(
stderr
,
"m = %Nx (bad)
\n
"
,
m
,
ecc
->
p
.
size
);
gmp_fprintf
(
stderr
,
"t = %Nx (bad)
\n
"
,
t
,
m
->
size
);
gmp_fprintf
(
stderr
,
"ref = %Nx
\n
"
,
ref
,
ecc
->
p
.
size
);
gmp_fprintf
(
stderr
,
"ref = %Nx
\n
"
,
ref
,
m
->
size
);
abort
();
}
}
ref_mod
(
ref
,
a
,
ecc
->
q
.
m
,
ecc
->
p
.
size
);
mpn_copyi
(
m
,
a
,
2
*
ecc
->
p
.
size
);
ecc
->
q
.
mod
(
&
ecc
->
q
,
m
);
if
(
mpn_cmp
(
m
,
ecc
->
q
.
m
,
ecc
->
p
.
size
)
>=
0
)
mpn_sub_n
(
m
,
m
,
ecc
->
q
.
m
,
ecc
->
p
.
size
);
if
(
mpn_cmp
(
m
,
ref
,
ecc
->
p
.
size
))
{
fprintf
(
stderr
,
"ecc->modq failed: bit_size = %u
\n
"
,
ecc
->
p
.
bit_size
);
gmp_fprintf
(
stderr
,
"a = %Nx
\n
"
,
a
,
2
*
ecc
->
p
.
size
);
gmp_fprintf
(
stderr
,
"m = %Nx (bad)
\n
"
,
m
,
ecc
->
p
.
size
);
gmp_fprintf
(
stderr
,
"ref = %Nx
\n
"
,
ref
,
ecc
->
p
.
size
);
abort
();
}
if
(
ecc
->
q
.
B_size
<
ecc
->
p
.
size
)
{
mpn_copyi
(
m
,
a
,
2
*
ecc
->
p
.
size
);
ecc_mod
(
&
ecc
->
q
,
m
);
if
(
mpn_cmp
(
m
,
ecc
->
q
.
m
,
ecc
->
p
.
size
)
>=
0
)
mpn_sub_n
(
m
,
m
,
ecc
->
q
.
m
,
ecc
->
p
.
size
);
if
(
mpn_cmp
(
m
,
ref
,
ecc
->
p
.
size
))
{
fprintf
(
stderr
,
"ecc_generic_modq failed: bit_size = %u
\n
"
,
ecc
->
q
.
bit_size
);
gmp_fprintf
(
stderr
,
"a = %Nx
\n
"
,
a
,
2
*
ecc
->
p
.
size
);
gmp_fprintf
(
stderr
,
"m = %Nx (bad)
\n
"
,
m
,
ecc
->
p
.
size
);
gmp_fprintf
(
stderr
,
"ref = %Nx
\n
"
,
ref
,
ecc
->
p
.
size
);
abort
();
abort
();
}
}
}
}
...
@@ -120,9 +87,10 @@ test_main (void)
...
@@ -120,9 +87,10 @@ test_main (void)
gmp_randinit_default
(
rands
);
gmp_randinit_default
(
rands
);
for
(
i
=
0
;
ecc_curves
[
i
];
i
++
)
for
(
i
=
0
;
ecc_curves
[
i
];
i
++
)
test_curve
(
rands
,
ecc_curves
[
i
]);
{
test_modulo
(
rands
,
"p"
,
&
ecc_curves
[
i
]
->
p
);
test_curve
(
rands
,
&
nettle_curve25519
);
test_modulo
(
rands
,
"q"
,
&
ecc_curves
[
i
]
->
q
);
}
gmp_randclear
(
rands
);
gmp_randclear
(
rands
);
}
}
#endif
/* ! NETTLE_USE_MINI_GMP */
#endif
/* ! NETTLE_USE_MINI_GMP */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment