diff options
Diffstat (limited to 'src/gns/test_gns_simple_shorten.c')
-rw-r--r-- | src/gns/test_gns_simple_shorten.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c index 1b383a0bd..a4cfa26dc 100644 --- a/src/gns/test_gns_simple_shorten.c +++ b/src/gns/test_gns_simple_shorten.c | |||
@@ -61,10 +61,10 @@ static struct GNUNET_GNS_Handle *gns_handle; | |||
61 | 61 | ||
62 | const struct GNUNET_CONFIGURATION_Handle *cfg; | 62 | const struct GNUNET_CONFIGURATION_Handle *cfg; |
63 | 63 | ||
64 | struct GNUNET_CRYPTO_EccPublicSignKey priv_pkey; | 64 | struct GNUNET_CRYPTO_EcdsaPublicKey priv_pkey; |
65 | struct GNUNET_CRYPTO_EccPublicSignKey short_pkey; | 65 | struct GNUNET_CRYPTO_EcdsaPublicKey short_pkey; |
66 | struct GNUNET_CRYPTO_EccPrivateKey *priv_key; | 66 | struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key; |
67 | struct GNUNET_CRYPTO_EccPrivateKey *short_key; | 67 | struct GNUNET_CRYPTO_EcdsaPrivateKey *short_key; |
68 | 68 | ||
69 | struct GNUNET_CRYPTO_ShortHashCode priv_zone; | 69 | struct GNUNET_CRYPTO_ShortHashCode priv_zone; |
70 | struct GNUNET_CRYPTO_ShortHashCode short_zone; | 70 | struct GNUNET_CRYPTO_ShortHashCode short_zone; |
@@ -170,15 +170,15 @@ void do_check (void *cls, | |||
170 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 170 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
171 | struct GNUNET_TESTING_Peer *peer) | 171 | struct GNUNET_TESTING_Peer *peer) |
172 | { | 172 | { |
173 | struct GNUNET_CRYPTO_EccPublicSignKey our_pkey; | 173 | struct GNUNET_CRYPTO_EcdsaPublicKey our_pkey; |
174 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; | 174 | struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey; |
175 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; | 175 | struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey; |
176 | struct GNUNET_CRYPTO_EccPrivateKey *our_key; | 176 | struct GNUNET_CRYPTO_EcdsaPrivateKey *our_key; |
177 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 177 | struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key; |
178 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 178 | struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key; |
179 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; | 179 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; |
180 | struct GNUNET_CRYPTO_ShortHashCode alice_hash; | 180 | struct GNUNET_CRYPTO_ShortHashCode alice_hash; |
181 | struct GNUNET_CRYPTO_EccSignature *sig; | 181 | struct GNUNET_CRYPTO_EcdsaSignature *sig; |
182 | char* our_keyfile; | 182 | char* our_keyfile; |
183 | char* private_keyfile; | 183 | char* private_keyfile; |
184 | char* shorten_keyfile; | 184 | char* shorten_keyfile; |
@@ -226,22 +226,22 @@ void do_check (void *cls, | |||
226 | return; | 226 | return; |
227 | } | 227 | } |
228 | 228 | ||
229 | our_key = GNUNET_CRYPTO_ecc_key_create_from_file (our_keyfile); | 229 | our_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (our_keyfile); |
230 | GNUNET_free(our_keyfile); | 230 | GNUNET_free(our_keyfile); |
231 | 231 | ||
232 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 232 | bob_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_BOB); |
233 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_ALICE); | 233 | alice_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_ALICE); |
234 | priv_key = GNUNET_CRYPTO_ecc_key_create_from_file (private_keyfile); | 234 | priv_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (private_keyfile); |
235 | short_key = GNUNET_CRYPTO_ecc_key_create_from_file (shorten_keyfile); | 235 | short_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (shorten_keyfile); |
236 | 236 | ||
237 | GNUNET_free(shorten_keyfile); | 237 | GNUNET_free(shorten_keyfile); |
238 | GNUNET_free(private_keyfile); | 238 | GNUNET_free(private_keyfile); |
239 | 239 | ||
240 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (our_key, &our_pkey); | 240 | GNUNET_CRYPTO_ecdsa_key_get_public (our_key, &our_pkey); |
241 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); | 241 | GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey); |
242 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); | 242 | GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey); |
243 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (priv_key, &priv_pkey); | 243 | GNUNET_CRYPTO_ecdsa_key_get_public (priv_key, &priv_pkey); |
244 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (short_key, &short_pkey); | 244 | GNUNET_CRYPTO_ecdsa_key_get_public (short_key, &short_pkey); |
245 | 245 | ||
246 | GNUNET_CRYPTO_short_hash(&priv_pkey, sizeof(priv_pkey), &priv_zone); | 246 | GNUNET_CRYPTO_short_hash(&priv_pkey, sizeof(priv_pkey), &priv_zone); |
247 | GNUNET_CRYPTO_short_hash(&short_pkey, sizeof(short_pkey), &short_zone); | 247 | GNUNET_CRYPTO_short_hash(&short_pkey, sizeof(short_pkey), &short_zone); |