Commit c165b7b2 authored by Niels Möller's avatar Niels Möller

Undo dsa-compat.h name mangling for testsuite.

parent ea94f78d
2014-03-28 Niels Möller <nisse@lysator.liu.se>
* testsuite/dsa-keygen-test.c (test_main): Explicitly use
dsa_compat_generate_keypair.
* testsuite/testutils.h: Undo dsa-compat.h name mangling.
* dsa-keygen.c (dsa_generate_keypair): New interface, generating
only a keypair, and no new parameters.
* dsa-compat-keygen.c (dsa_compat_generate_keypair): New file.
......
......@@ -23,7 +23,7 @@ test_main(void)
knuth_lfib_init(&lfib, 13);
params = (struct dsa_params *) &pub;
ASSERT (dsa_generate_keypair(&pub, &key,
ASSERT (dsa_compat_generate_keypair(&pub, &key,
&lfib,
(nettle_random_func *) knuth_lfib_random,
NULL, verbose ? progress : NULL,
......@@ -32,7 +32,7 @@ test_main(void)
test_dsa_key(params, pub.y, key.x, 160);
test_dsa160(&pub, &key, NULL);
ASSERT (dsa_generate_keypair(&pub, &key,
ASSERT (dsa_compat_generate_keypair(&pub, &key,
&lfib,
(nettle_random_func *) knuth_lfib_random,
NULL, verbose ? progress : NULL,
......@@ -41,7 +41,7 @@ test_main(void)
test_dsa_key(params, pub.y, key.x, 256);
test_dsa256(&pub, &key, NULL);
ASSERT (dsa_generate_keypair(&pub, &key,
ASSERT (dsa_compat_generate_keypair(&pub, &key,
&lfib,
(nettle_random_func *) knuth_lfib_random,
NULL, verbose ? progress : NULL,
......
......@@ -24,6 +24,10 @@
# include "ecc-internal.h"
# include "ecdsa.h"
# include "gmp-glue.h"
/* Undo some dsa-compat name mangling */
#undef dsa_generate_keypair
#define dsa_generate_keypair nettle_dsa_generate_keypair
#endif
#include "nettle-meta.h"
......@@ -198,11 +202,13 @@ test_dsa256(const struct dsa_public_key *pub,
const struct dsa_private_key *key,
const struct dsa_signature *expected);
#if 0
void
test_dsa_sign(const struct dsa_public_key *pub,
const struct dsa_private_key *key,
const struct nettle_hash *hash,
const struct dsa_signature *expected);
#endif
void
test_dsa_verify(const struct dsa_params *params,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment