From deb0d815d8e7b0456401713d920345ba1ca12236 Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Tue, 10 Apr 2012 12:45:36 +0000 Subject: [PATCH] -more keys --- src/gns/test_gns_dht_delegated_lookup.c | 4 +++- src/gns/test_gns_max_queries.c | 4 +++- src/gns/test_gns_simple_delegated_lookup.c | 4 +++- src/gns/test_gns_simple_get_authority.c | 7 +++++-- src/gns/test_gns_simple_mx_lookup.c | 4 +++- src/gns/test_gns_simple_zkey_lookup.c | 4 +++- 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/gns/test_gns_dht_delegated_lookup.c b/src/gns/test_gns_dht_delegated_lookup.c index 96768aa5c..14a8cb100 100644 --- a/src/gns/test_gns_dht_delegated_lookup.c +++ b/src/gns/test_gns_dht_delegated_lookup.c @@ -51,6 +51,8 @@ #define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) +#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" + /* Globals */ /** @@ -303,7 +305,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, } alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); - bob_key = GNUNET_CRYPTO_rsa_key_create (); + bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); GNUNET_free(alice_keyfile); diff --git a/src/gns/test_gns_max_queries.c b/src/gns/test_gns_max_queries.c index 75cd877f2..01649231f 100644 --- a/src/gns/test_gns_max_queries.c +++ b/src/gns/test_gns_max_queries.c @@ -49,6 +49,8 @@ #define TEST_ADDITIONAL_LOOKUPS 5 #define TEST_AUTHORITY_NAME "bob" +#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" + /* Globals */ /** @@ -256,7 +258,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, } alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); - bob_key = GNUNET_CRYPTO_rsa_key_create (); + bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); diff --git a/src/gns/test_gns_simple_delegated_lookup.c b/src/gns/test_gns_simple_delegated_lookup.c index 05ed2fe77..1f02a71bf 100644 --- a/src/gns/test_gns_simple_delegated_lookup.c +++ b/src/gns/test_gns_simple_delegated_lookup.c @@ -62,6 +62,8 @@ #define TEST_AUTHORITY_NAME "bob" +#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" + /* Globals */ /** @@ -229,7 +231,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, } alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); - bob_key = GNUNET_CRYPTO_rsa_key_create (); + bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); diff --git a/src/gns/test_gns_simple_get_authority.c b/src/gns/test_gns_simple_get_authority.c index d4359ca6d..b69f1af58 100644 --- a/src/gns/test_gns_simple_get_authority.c +++ b/src/gns/test_gns_simple_get_authority.c @@ -51,6 +51,9 @@ #define TEST_ALICE_PSEU "carol" #define TEST_EXPECTED_RESULT "alice.bob.gnunet" +#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" +#define KEYFILE_ALICE "../namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey" + /* Globals */ /** @@ -224,8 +227,8 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id, our_key = GNUNET_CRYPTO_rsa_key_create_from_file (our_keyfile); GNUNET_free(our_keyfile); - bob_key = GNUNET_CRYPTO_rsa_key_create (); - alice_key = GNUNET_CRYPTO_rsa_key_create (); + bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); + alice_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_ALICE); GNUNET_CRYPTO_rsa_key_get_public (our_key, &our_pkey); GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); diff --git a/src/gns/test_gns_simple_mx_lookup.c b/src/gns/test_gns_simple_mx_lookup.c index 2888bc396..967829f7e 100644 --- a/src/gns/test_gns_simple_mx_lookup.c +++ b/src/gns/test_gns_simple_mx_lookup.c @@ -50,6 +50,8 @@ #define TEST_AUTHORITY_NAME "bob" +#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" + /* Globals */ /** @@ -246,7 +248,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, } alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); - bob_key = GNUNET_CRYPTO_rsa_key_create (); + bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c index 729a53705..3ca331327 100644 --- a/src/gns/test_gns_simple_zkey_lookup.c +++ b/src/gns/test_gns_simple_zkey_lookup.c @@ -48,6 +48,8 @@ #define TEST_AUTHORITY_NAME "bob" +#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" + /* Globals */ /** @@ -232,7 +234,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, } alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); - bob_key = GNUNET_CRYPTO_rsa_key_create (); + bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); -- 2.25.1