static struct GNUNET_CONTAINER_MetaData *meta;
-static struct GNUNET_PseudonymIdentifier id1;
+static struct GNUNET_CRYPTO_EccPublicKey id1;
static int
-iter (void *cls, const struct GNUNET_PseudonymIdentifier * pseudonym,
+iter (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKey *pseudonym,
const char *name, const char *unique_name,
const struct GNUNET_CONTAINER_MetaData *md, int32_t rating)
{
int *ok = cls;
- if ((0 == memcmp (pseudonym, &id1, sizeof (struct GNUNET_PseudonymIdentifier))) &&
+ if ((0 == memcmp (pseudonym, &id1, sizeof (struct GNUNET_CRYPTO_EccPublicKey))) &&
(!GNUNET_CONTAINER_meta_data_test_equal (md, meta)))
{
*ok = GNUNET_NO;
static int
-noti_callback (void *cls, const struct GNUNET_PseudonymIdentifier * pseudonym,
+noti_callback (void *cls, const struct GNUNET_CRYPTO_EccPublicKey *pseudonym,
const char *name, const char *unique_name,
const struct GNUNET_CONTAINER_MetaData *md, int32_t rating)
{
static int
-fake_noti_callback (void *cls, const struct GNUNET_PseudonymIdentifier * pseudonym,
+fake_noti_callback (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKey * pseudonym,
const char *name, const char *unique_name,
const struct GNUNET_CONTAINER_MetaData *md, int32_t rating)
{
static void
-create_pseu (struct GNUNET_PseudonymIdentifier *pseu)
+create_pseu (struct GNUNET_CRYPTO_EccPublicKey *pseu)
{
- struct GNUNET_PseudonymHandle *ph;
+ struct GNUNET_CRYPTO_EccPrivateKey *ph;
- ph = GNUNET_PSEUDONYM_create (NULL);
- GNUNET_PSEUDONYM_get_identifier (ph, pseu);
- GNUNET_PSEUDONYM_destroy (ph);
+ ph = GNUNET_CRYPTO_ecc_key_create ();
+ GNUNET_CRYPTO_ecc_key_get_public (ph, pseu);
+ GNUNET_free (ph);
}
test_io ()
{
int ok;
- struct GNUNET_PseudonymIdentifier rid1;
- struct GNUNET_PseudonymIdentifier id2;
- struct GNUNET_PseudonymIdentifier rid2;
- struct GNUNET_PseudonymIdentifier fid;
- struct GNUNET_PseudonymIdentifier id3;
+ struct GNUNET_CRYPTO_EccPublicKey rid1;
+ struct GNUNET_CRYPTO_EccPublicKey id2;
+ struct GNUNET_CRYPTO_EccPublicKey rid2;
+ struct GNUNET_CRYPTO_EccPublicKey fid;
+ struct GNUNET_CRYPTO_EccPublicKey id3;
int old;
int newVal;
struct GNUNET_CONFIGURATION_Handle *cfg;
int noname_is_a_dup;
int notiCount, fakenotiCount;
static char m[1024 * 1024 * 10];
- struct GNUNET_PSEUDONYM_DiscoveryHandle *dh1;
- struct GNUNET_PSEUDONYM_DiscoveryHandle *dh2;
+ struct GNUNET_FS_Pseudonym_DiscoveryHandle *dh1;
+ struct GNUNET_FS_Pseudonym_DiscoveryHandle *dh2;
memset (m, 'b', sizeof (m));
m[sizeof (m) - 1] = '\0';
-
GNUNET_log_setup ("test-pseudonym", "WARNING", NULL);
ok = GNUNET_YES;
(void) GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test");
}
notiCount = 0;
fakenotiCount = 0;
- dh1 = GNUNET_PSEUDONYM_discovery_callback_register (cfg, &fake_noti_callback,
+ dh1 = GNUNET_FS_pseudonym_discovery_callback_register (cfg, &fake_noti_callback,
&fakenotiCount);
- dh2 = GNUNET_PSEUDONYM_discovery_callback_register (cfg, ¬i_callback,
+ dh2 = GNUNET_FS_pseudonym_discovery_callback_register (cfg, ¬i_callback,
¬iCount);
- GNUNET_PSEUDONYM_discovery_callback_unregister (dh1);
+ GNUNET_FS_pseudonym_discovery_callback_unregister (dh1);
/* ACTUAL TEST CODE */
- old = GNUNET_PSEUDONYM_list_all (cfg, NULL, NULL);
+ old = GNUNET_FS_pseudonym_list_all (cfg, NULL, NULL);
meta = GNUNET_CONTAINER_meta_data_create ();
GNUNET_CONTAINER_meta_data_insert (meta, "<test>", EXTRACTOR_METATYPE_TITLE,
EXTRACTOR_METAFORMAT_UTF8, "text/plain",
"test", strlen ("test") + 1);
create_pseu (&id1);
- GNUNET_PSEUDONYM_add (cfg, &id1, meta);
+ GNUNET_FS_pseudonym_add (cfg, &id1, meta);
CHECK (notiCount == 1);
- GNUNET_PSEUDONYM_add (cfg, &id1, meta);
+ GNUNET_FS_pseudonym_add (cfg, &id1, meta);
CHECK (notiCount == 2);
- newVal = GNUNET_PSEUDONYM_list_all (cfg, &iter, &ok);
+ newVal = GNUNET_FS_pseudonym_list_all (cfg, &iter, &ok);
CHECK (old < newVal);
old = newVal;
create_pseu (&id2);
- GNUNET_PSEUDONYM_add (cfg, &id2, meta);
+ GNUNET_FS_pseudonym_add (cfg, &id2, meta);
CHECK (notiCount == 3);
- newVal = GNUNET_PSEUDONYM_list_all (cfg, &iter, &ok);
+ newVal = GNUNET_FS_pseudonym_list_all (cfg, &iter, &ok);
CHECK (old < newVal);
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_meta_data_insert (meta, "<test>",
"text/plain", m,
strlen (m) + 1));
create_pseu (&id3);
- GNUNET_PSEUDONYM_add (cfg, &id3, meta);
- GNUNET_PSEUDONYM_get_info (cfg, &id3, NULL, NULL, &name3, NULL);
+ GNUNET_FS_pseudonym_add (cfg, &id3, meta);
+ GNUNET_FS_pseudonym_get_info (cfg, &id3, NULL, NULL, &name3, NULL);
CHECK (name3 != NULL);
- GNUNET_PSEUDONYM_get_info (cfg, &id2, NULL, NULL, &name2, NULL);
+ GNUNET_FS_pseudonym_get_info (cfg, &id2, NULL, NULL, &name2, NULL);
CHECK (name2 != NULL);
- GNUNET_PSEUDONYM_get_info (cfg, &id1, NULL, NULL, &name1, NULL);
+ GNUNET_FS_pseudonym_get_info (cfg, &id1, NULL, NULL, &name1, NULL);
CHECK (name1 != NULL);
CHECK (0 == strcmp (name1, name2));
- name1_unique = GNUNET_PSEUDONYM_name_uniquify (cfg, &id1, name1, NULL);
- name2_unique = GNUNET_PSEUDONYM_name_uniquify (cfg, &id2, name2, NULL);
+ name1_unique = GNUNET_FS_pseudonym_name_uniquify (cfg, &id1, name1, NULL);
+ name2_unique = GNUNET_FS_pseudonym_name_uniquify (cfg, &id2, name2, NULL);
CHECK (0 != strcmp (name1_unique, name2_unique));
- CHECK (GNUNET_SYSERR == GNUNET_PSEUDONYM_name_to_id (cfg, "fake", &rid2));
- CHECK (GNUNET_SYSERR == GNUNET_PSEUDONYM_name_to_id (cfg, name2, &rid2));
- CHECK (GNUNET_SYSERR == GNUNET_PSEUDONYM_name_to_id (cfg, name1, &rid1));
- CHECK (GNUNET_OK == GNUNET_PSEUDONYM_name_to_id (cfg, name2_unique, &rid2));
- CHECK (GNUNET_OK == GNUNET_PSEUDONYM_name_to_id (cfg, name1_unique, &rid1));
- CHECK (0 == memcmp (&id1, &rid1, sizeof (struct GNUNET_PseudonymIdentifier)));
- CHECK (0 == memcmp (&id2, &rid2, sizeof (struct GNUNET_PseudonymIdentifier)));
+ CHECK (GNUNET_SYSERR == GNUNET_FS_pseudonym_name_to_id (cfg, "fake", &rid2));
+ CHECK (GNUNET_SYSERR == GNUNET_FS_pseudonym_name_to_id (cfg, name2, &rid2));
+ CHECK (GNUNET_SYSERR == GNUNET_FS_pseudonym_name_to_id (cfg, name1, &rid1));
+ CHECK (GNUNET_OK == GNUNET_FS_pseudonym_name_to_id (cfg, name2_unique, &rid2));
+ CHECK (GNUNET_OK == GNUNET_FS_pseudonym_name_to_id (cfg, name1_unique, &rid1));
+ CHECK (0 == memcmp (&id1, &rid1, sizeof (struct GNUNET_CRYPTO_EccPublicKey)));
+ CHECK (0 == memcmp (&id2, &rid2, sizeof (struct GNUNET_CRYPTO_EccPublicKey)));
create_pseu (&fid);
GNUNET_log_skip (1, GNUNET_NO);
- CHECK (0 == GNUNET_PSEUDONYM_rank (cfg, &fid, 0));
+ CHECK (0 == GNUNET_FS_pseudonym_rank (cfg, &fid, 0));
GNUNET_log_skip (0, GNUNET_NO);
- CHECK (GNUNET_OK == GNUNET_PSEUDONYM_get_info (cfg, &fid, NULL, NULL, &noname, &noname_is_a_dup));
+ CHECK (GNUNET_OK == GNUNET_FS_pseudonym_get_info (cfg, &fid, NULL, NULL, &noname, &noname_is_a_dup));
CHECK (noname != NULL);
CHECK (noname_is_a_dup == GNUNET_YES);
- CHECK (0 == GNUNET_PSEUDONYM_rank (cfg, &id1, 0));
- CHECK (5 == GNUNET_PSEUDONYM_rank (cfg, &id1, 5));
- CHECK (-5 == GNUNET_PSEUDONYM_rank (cfg, &id1, -10));
- CHECK (0 == GNUNET_PSEUDONYM_rank (cfg, &id1, 5));
+ CHECK (0 == GNUNET_FS_pseudonym_rank (cfg, &id1, 0));
+ CHECK (5 == GNUNET_FS_pseudonym_rank (cfg, &id1, 5));
+ CHECK (-5 == GNUNET_FS_pseudonym_rank (cfg, &id1, -10));
+ CHECK (0 == GNUNET_FS_pseudonym_rank (cfg, &id1, 5));
GNUNET_free (name1);
GNUNET_free (name2);
GNUNET_free (name1_unique);
GNUNET_free (noname);
/* END OF TEST CODE */
FAILURE:
- GNUNET_PSEUDONYM_discovery_callback_unregister (dh2);
+ GNUNET_FS_pseudonym_discovery_callback_unregister (dh2);
GNUNET_CONTAINER_meta_data_destroy (meta);
GNUNET_CONFIGURATION_destroy (cfg);
return (ok == GNUNET_YES) ? 0 : 1;
}
-/**
- * Use the given input to sign and check the resulting signature.
- */
-static void
-test_signature (struct GNUNET_PseudonymHandle *ph,
- struct GNUNET_PseudonymSignaturePurpose *purpose,
- struct GNUNET_HashCode *seed,
- struct GNUNET_HashCode *signing_key,
- char *bit)
-{
- struct GNUNET_PseudonymSignature signature;
- struct GNUNET_PseudonymSignature signature2;
- struct GNUNET_PseudonymIdentifier pseudonym;
- struct GNUNET_PseudonymIdentifier verification_key;
-
- GNUNET_PSEUDONYM_sign (ph, purpose, seed, signing_key, &signature);
- if (0)
- {
- GNUNET_PSEUDONYM_sign (ph, purpose, seed, signing_key, &signature2);
- /* with seed, two sigs must be identical, without, they must be different! */
- if (NULL != seed)
- GNUNET_break (0 == memcmp (&signature, &signature2, sizeof (signature)));
- else /* crypto not implemented, thus for now 'break' */
- GNUNET_break (0 != memcmp (&signature, &signature2, sizeof (signature)));
- }
- GNUNET_PSEUDONYM_get_identifier (ph, &pseudonym);
- GNUNET_PSEUDONYM_derive_verification_key (&pseudonym,
- signing_key,
- &verification_key);
- GNUNET_break (GNUNET_OK ==
- GNUNET_PSEUDONYM_verify (purpose, &signature, &verification_key));
- /* also check that if the data is changed, the signature no longer matches */
- (*bit)++;
- /* crypto not implemented, thus for now 'break' */
- GNUNET_break (GNUNET_OK !=
- GNUNET_PSEUDONYM_verify (purpose, &signature, &verification_key));
- (*bit)--;
-}
-
-
-/**
- * Test cryptographic operations for a given private key.
- *
- * @param ph private key to test
- */
-static void
-test_crypto_ops (struct GNUNET_PseudonymHandle *ph)
-{
- char data[16];
- struct GNUNET_PseudonymSignaturePurpose *purpose;
- struct GNUNET_HashCode seed;
- struct GNUNET_HashCode signing_key;
-
- memset (data, 42, sizeof (data));
- purpose = (struct GNUNET_PseudonymSignaturePurpose *) data;
- purpose->size = htonl (sizeof (data));
- purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TEST);
- memset (&seed, 41, sizeof (seed));
- memset (&signing_key, 40, sizeof (signing_key));
- test_signature (ph, purpose, &seed, &signing_key, &data[sizeof (struct GNUNET_PseudonymSignaturePurpose)]);
- test_signature (ph, purpose, NULL, &signing_key, &data[sizeof (struct GNUNET_PseudonymSignaturePurpose)]);
-}
-
-
-/**
- * Test cryptographic operations.
- */
-static int
-test_crypto ()
-{
- struct GNUNET_PseudonymHandle *ph;
- struct GNUNET_PseudonymIdentifier pseudonym;
- struct GNUNET_PseudonymIdentifier pseudonym2;
-
- /* check writing to and reading from disk */
- ph = GNUNET_PSEUDONYM_create ("/tmp/gnunet-pseudonym-test/pseu.dsa");
- GNUNET_PSEUDONYM_get_identifier (ph, &pseudonym);
- GNUNET_PSEUDONYM_destroy (ph);
- ph = GNUNET_PSEUDONYM_create ("/tmp/gnunet-pseudonym-test/pseu.dsa");
- GNUNET_PSEUDONYM_get_identifier (ph, &pseudonym2);
- test_crypto_ops (ph);
- GNUNET_PSEUDONYM_destroy (ph);
- if (0 != memcmp (&pseudonym, &pseudonym2, sizeof (pseudonym)))
- return 1;
-
- /* check in-memory generation */
- ph = GNUNET_PSEUDONYM_create (NULL);
- GNUNET_PSEUDONYM_get_identifier (ph, &pseudonym2);
- if (0 == memcmp (&pseudonym, &pseudonym2, sizeof (pseudonym)))
- return 1;
- test_crypto_ops (ph);
- GNUNET_PSEUDONYM_destroy (ph);
-
- /* check anonymous pseudonym operations generation */
- ph = GNUNET_PSEUDONYM_get_anonymous_pseudonym_handle ();
- GNUNET_PSEUDONYM_get_identifier (ph, &pseudonym2);
- if (0 == memcmp (&pseudonym, &pseudonym2, sizeof (pseudonym)))
- return 1;
- test_crypto_ops (ph);
- GNUNET_PSEUDONYM_destroy (ph);
- return 0;
-}
-
-
int
main (int argc, char *argv[])
{
+ GNUNET_log_setup ("test-pseudonym", "WARNING", NULL);
if (0 != test_io ())
return 1;
- if (0 != test_crypto ())
- return 1;
GNUNET_break (GNUNET_OK ==
GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test"));
return 0;