diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-04-10 12:45:36 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-04-10 12:45:36 +0000 |
commit | deb0d815d8e7b0456401713d920345ba1ca12236 (patch) | |
tree | a1e3bb815a6738d91a101c3c675dd8fee3cef0df | |
parent | d4eaac0fd6040c9b58c7f9784cf28a8f97703fcd (diff) | |
download | gnunet-deb0d815d8e7b0456401713d920345ba1ca12236.tar.gz gnunet-deb0d815d8e7b0456401713d920345ba1ca12236.zip |
-more keys
-rw-r--r-- | src/gns/test_gns_dht_delegated_lookup.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_max_queries.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_simple_delegated_lookup.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_simple_get_authority.c | 7 | ||||
-rw-r--r-- | src/gns/test_gns_simple_mx_lookup.c | 4 | ||||
-rw-r--r-- | 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 @@ | |||
51 | 51 | ||
52 | #define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) | 52 | #define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) |
53 | 53 | ||
54 | #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" | ||
55 | |||
54 | /* Globals */ | 56 | /* Globals */ |
55 | 57 | ||
56 | /** | 58 | /** |
@@ -303,7 +305,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, | |||
303 | } | 305 | } |
304 | 306 | ||
305 | alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); | 307 | alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); |
306 | bob_key = GNUNET_CRYPTO_rsa_key_create (); | 308 | bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); |
307 | 309 | ||
308 | GNUNET_free(alice_keyfile); | 310 | GNUNET_free(alice_keyfile); |
309 | 311 | ||
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 @@ | |||
49 | #define TEST_ADDITIONAL_LOOKUPS 5 | 49 | #define TEST_ADDITIONAL_LOOKUPS 5 |
50 | #define TEST_AUTHORITY_NAME "bob" | 50 | #define TEST_AUTHORITY_NAME "bob" |
51 | 51 | ||
52 | #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" | ||
53 | |||
52 | /* Globals */ | 54 | /* Globals */ |
53 | 55 | ||
54 | /** | 56 | /** |
@@ -256,7 +258,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, | |||
256 | } | 258 | } |
257 | 259 | ||
258 | alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); | 260 | alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); |
259 | bob_key = GNUNET_CRYPTO_rsa_key_create (); | 261 | bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); |
260 | 262 | ||
261 | GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); | 263 | GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); |
262 | GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); | 264 | 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 @@ | |||
62 | 62 | ||
63 | #define TEST_AUTHORITY_NAME "bob" | 63 | #define TEST_AUTHORITY_NAME "bob" |
64 | 64 | ||
65 | #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" | ||
66 | |||
65 | /* Globals */ | 67 | /* Globals */ |
66 | 68 | ||
67 | /** | 69 | /** |
@@ -229,7 +231,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, | |||
229 | } | 231 | } |
230 | 232 | ||
231 | alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); | 233 | alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); |
232 | bob_key = GNUNET_CRYPTO_rsa_key_create (); | 234 | bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); |
233 | 235 | ||
234 | GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); | 236 | GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); |
235 | GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); | 237 | 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 @@ | |||
51 | #define TEST_ALICE_PSEU "carol" | 51 | #define TEST_ALICE_PSEU "carol" |
52 | #define TEST_EXPECTED_RESULT "alice.bob.gnunet" | 52 | #define TEST_EXPECTED_RESULT "alice.bob.gnunet" |
53 | 53 | ||
54 | #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" | ||
55 | #define KEYFILE_ALICE "../namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey" | ||
56 | |||
54 | /* Globals */ | 57 | /* Globals */ |
55 | 58 | ||
56 | /** | 59 | /** |
@@ -224,8 +227,8 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id, | |||
224 | our_key = GNUNET_CRYPTO_rsa_key_create_from_file (our_keyfile); | 227 | our_key = GNUNET_CRYPTO_rsa_key_create_from_file (our_keyfile); |
225 | GNUNET_free(our_keyfile); | 228 | GNUNET_free(our_keyfile); |
226 | 229 | ||
227 | bob_key = GNUNET_CRYPTO_rsa_key_create (); | 230 | bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); |
228 | alice_key = GNUNET_CRYPTO_rsa_key_create (); | 231 | alice_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_ALICE); |
229 | 232 | ||
230 | GNUNET_CRYPTO_rsa_key_get_public (our_key, &our_pkey); | 233 | GNUNET_CRYPTO_rsa_key_get_public (our_key, &our_pkey); |
231 | GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); | 234 | 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 @@ | |||
50 | 50 | ||
51 | #define TEST_AUTHORITY_NAME "bob" | 51 | #define TEST_AUTHORITY_NAME "bob" |
52 | 52 | ||
53 | #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" | ||
54 | |||
53 | /* Globals */ | 55 | /* Globals */ |
54 | 56 | ||
55 | /** | 57 | /** |
@@ -246,7 +248,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, | |||
246 | } | 248 | } |
247 | 249 | ||
248 | alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); | 250 | alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); |
249 | bob_key = GNUNET_CRYPTO_rsa_key_create (); | 251 | bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); |
250 | 252 | ||
251 | GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); | 253 | GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); |
252 | GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); | 254 | 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 @@ | |||
48 | 48 | ||
49 | #define TEST_AUTHORITY_NAME "bob" | 49 | #define TEST_AUTHORITY_NAME "bob" |
50 | 50 | ||
51 | #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" | ||
52 | |||
51 | /* Globals */ | 53 | /* Globals */ |
52 | 54 | ||
53 | /** | 55 | /** |
@@ -232,7 +234,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, | |||
232 | } | 234 | } |
233 | 235 | ||
234 | alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); | 236 | alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); |
235 | bob_key = GNUNET_CRYPTO_rsa_key_create (); | 237 | bob_key = GNUNET_CRYPTO_rsa_key_create (KEYFILE_BOB); |
236 | 238 | ||
237 | GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); | 239 | GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); |
238 | GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); | 240 | GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); |