Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Nettle
nettle
Commits
0f1adf55
Commit
0f1adf55
authored
Jun 25, 2014
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Eliminate more uses of gmp_fprintf.
parent
51fb8e8f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
14 deletions
+31
-14
ChangeLog
ChangeLog
+5
-0
testsuite/ecdsa-keygen-test.c
testsuite/ecdsa-keygen-test.c
+7
-5
testsuite/ecdsa-sign-test.c
testsuite/ecdsa-sign-test.c
+9
-4
testsuite/ecdsa-verify-test.c
testsuite/ecdsa-verify-test.c
+10
-5
No files found.
ChangeLog
View file @
0f1adf55
2014-06-25 Niels Möller <nisse@lysator.liu.se>
* testsuite/ecdsa-keygen-test.c (test_main): Use printf,
mpz_out_str and write_mpn instead of gmp_fprintf.
* testsuite/ecdsa-sign-test.c (test_ecdsa): Likewise.
* testsuite/ecdsa-verify-test.c (test_ecdsa): Likewise.
* dsa.h: Include bignum.h instead of gmp.h.
* ecc-internal.h: Likewise.
* ecc.h: Likewise.
...
...
testsuite/ecdsa-keygen-test.c
View file @
0f1adf55
...
...
@@ -71,11 +71,13 @@ test_main (void)
if
(
verbose
)
{
gmp_fprintf
(
stderr
,
"Public key:
\n
x = %Nx
\n
y = %Nx
\n
"
,
pub
.
p
,
ecc
->
size
,
pub
.
p
+
ecc
->
size
,
ecc
->
size
);
gmp_fprintf
(
stderr
,
"Private key: %Nx
\n
"
,
key
.
p
,
ecc
->
size
);
fprintf
(
stderr
,
"Public key:
\n
x = "
);
write_mpn
(
stderr
,
16
,
pub
.
p
,
ecc
->
size
);
fprintf
(
stderr
,
"
\n
y = "
);
write_mpn
(
stderr
,
16
,
pub
.
p
+
ecc
->
size
,
ecc
->
size
);
fprintf
(
stderr
,
"
\n
Private key: "
);
write_mpn
(
stderr
,
16
,
key
.
p
,
ecc
->
size
);
fprintf
(
stderr
,
"
\n
"
);
}
if
(
!
ecc_valid_p
(
&
pub
))
die
(
"ecdsa_generate_keypair produced an invalid point.
\n
"
);
...
...
testsuite/ecdsa-sign-test.c
View file @
0f1adf55
...
...
@@ -34,10 +34,15 @@ test_ecdsa (const struct ecc_curve *ecc,
||
mpz_limbs_cmp
(
ref
.
s
,
sp
,
ecc
->
size
)
!=
0
)
{
fprintf
(
stderr
,
"_ecdsa_sign failed, bit_size = %u
\n
"
,
ecc
->
bit_size
);
gmp_fprintf
(
stderr
,
"r = %Nx
\n
"
,
rp
,
ecc
->
size
);
gmp_fprintf
(
stderr
,
"s = %Nx
\n
"
,
sp
,
ecc
->
size
);
gmp_fprintf
(
stderr
,
"ref.r = %Zx
\n
"
,
ref
.
r
);
gmp_fprintf
(
stderr
,
"ref.s = %Zx
\n
"
,
ref
.
s
);
fprintf
(
stderr
,
"r = "
);
write_mpn
(
stderr
,
16
,
rp
,
ecc
->
size
);
fprintf
(
stderr
,
"
\n
s = "
);
write_mpn
(
stderr
,
16
,
sp
,
ecc
->
size
);
fprintf
(
stderr
,
"
\n
ref.r = "
);
mpz_out_str
(
stderr
,
16
,
ref
.
r
);
fprintf
(
stderr
,
"
\n
ref.s = "
);
mpz_out_str
(
stderr
,
16
,
ref
.
s
);
fprintf
(
stderr
,
"
\n
"
);
abort
();
}
...
...
testsuite/ecdsa-verify-test.c
View file @
0f1adf55
...
...
@@ -29,12 +29,17 @@ test_ecdsa (const struct ecc_curve *ecc,
{
fprintf
(
stderr
,
"ecdsa_verify failed with valid signature.
\n
"
);
fail:
fprintf
(
stderr
,
"bit_size = %u
\n
"
,
ecc
->
bit_size
);
gmp_fprintf
(
stderr
,
"x = %Zx
\n
"
,
x
);
gmp_fprintf
(
stderr
,
"y = %Zx
\n
digest "
,
y
);
fprintf
(
stderr
,
"bit_size = %u
\n
x = "
,
ecc
->
bit_size
);
mpz_out_str
(
stderr
,
16
,
x
);
fprintf
(
stderr
,
"
\n
y = "
);
mpz_out_str
(
stderr
,
16
,
y
);
fprintf
(
stderr
,
"
\n
digest "
);
print_hex
(
h
->
length
,
h
->
data
);
gmp_fprintf
(
stderr
,
"r = %Zx
\n
"
,
signature
.
r
);
gmp_fprintf
(
stderr
,
"s = %Zx
\n
"
,
signature
.
s
);
fprintf
(
stderr
,
"r = "
);
mpz_out_str
(
stderr
,
16
,
signature
.
r
);
fprintf
(
stderr
,
"
\n
s = "
);
mpz_out_str
(
stderr
,
16
,
signature
.
s
);
fprintf
(
stderr
,
"
\n
"
);
abort
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment