[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28758 - in gnunet/src: core fs gns identity include namest
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r28758 - in gnunet/src: core fs gns identity include namestore nse peerinfo-tool pt regex testing transport util |
|
Date: |
Wed, 21 Aug 2013 17:34:18 +0200 |
Author: grothoff
Date: 2013-08-21 17:34:18 +0200 (Wed, 21 Aug 2013)
New Revision: 28758
Modified:
gnunet/src/core/gnunet-service-core_kx.c
gnunet/src/fs/fs_publish_ublock.c
gnunet/src/fs/fs_uri.c
gnunet/src/fs/test_fs_namespace.c
gnunet/src/fs/test_fs_namespace_list_updateable.c
gnunet/src/fs/test_pseudonym.c
gnunet/src/gns/gnunet-gns-helper-service-w32.c
gnunet/src/gns/gnunet-gns-proxy.c
gnunet/src/gns/gnunet-gns.c
gnunet/src/gns/test_gns_cname_lookup.c
gnunet/src/gns/test_gns_dht_three_peers.c
gnunet/src/gns/test_gns_max_queries.c
gnunet/src/gns/test_gns_ns_lookup.c
gnunet/src/gns/test_gns_proxy.c
gnunet/src/gns/test_gns_pseu_shorten.c
gnunet/src/gns/test_gns_revocation.c
gnunet/src/gns/test_gns_simple_delegated_lookup.c
gnunet/src/gns/test_gns_simple_lookup.c
gnunet/src/gns/test_gns_simple_mx_lookup.c
gnunet/src/gns/test_gns_simple_shorten.c
gnunet/src/gns/test_gns_simple_srv_lookup.c
gnunet/src/gns/test_gns_simple_zkey_lookup.c
gnunet/src/identity/gnunet-service-identity.c
gnunet/src/identity/identity_api.c
gnunet/src/include/gnunet_crypto_lib.h
gnunet/src/namestore/gnunet-namestore-fcfsd.c
gnunet/src/namestore/test_namestore_api.c
gnunet/src/namestore/test_namestore_api_create.c
gnunet/src/namestore/test_namestore_api_create_update.c
gnunet/src/namestore/test_namestore_api_lookup.c
gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
gnunet/src/namestore/test_namestore_api_monitoring.c
gnunet/src/namestore/test_namestore_api_put.c
gnunet/src/namestore/test_namestore_api_remove.c
gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
gnunet/src/namestore/test_namestore_api_zone_iteration.c
gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
gnunet/src/namestore/test_namestore_api_zone_to_name.c
gnunet/src/nse/gnunet-service-nse.c
gnunet/src/peerinfo-tool/gnunet-peerinfo.c
gnunet/src/pt/test_gns_vpn.c
gnunet/src/regex/gnunet-daemon-regexprofiler.c
gnunet/src/regex/gnunet-service-regex.c
gnunet/src/testing/gnunet-testing.c
gnunet/src/testing/testing.c
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/util/crypto_ecc.c
gnunet/src/util/gnunet-ecc.c
gnunet/src/util/test_crypto_ecc.c
Log:
removing GNUNET_CRYPTO_ecc_key_free, use GNUNET_free directly instead
Modified: gnunet/src/core/gnunet-service-core_kx.c
===================================================================
--- gnunet/src/core/gnunet-service-core_kx.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/core/gnunet-service-core_kx.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -1518,7 +1518,7 @@
&do_rekey,
NULL);
if (NULL != my_ephemeral_key)
- GNUNET_CRYPTO_ecc_key_free (my_ephemeral_key);
+ GNUNET_free (my_ephemeral_key);
my_ephemeral_key = GNUNET_CRYPTO_ecc_key_create ();
GNUNET_assert (NULL != my_ephemeral_key);
sign_ephemeral_key ();
@@ -1553,7 +1553,7 @@
if (NULL == my_ephemeral_key)
{
GNUNET_break (0);
- GNUNET_CRYPTO_ecc_key_free (my_private_key);
+ GNUNET_free (my_private_key);
my_private_key = NULL;
return GNUNET_SYSERR;
}
@@ -1586,12 +1586,12 @@
if ( (NULL != my_ephemeral_key) &&
(my_ephemeral_key != my_private_key) )
{
- GNUNET_CRYPTO_ecc_key_free (my_ephemeral_key);
+ GNUNET_free (my_ephemeral_key);
my_ephemeral_key = NULL;
}
if (NULL != my_private_key)
{
- GNUNET_CRYPTO_ecc_key_free (my_private_key);
+ GNUNET_free (my_private_key);
my_private_key = NULL;
}
if (NULL != mst)
Modified: gnunet/src/fs/fs_publish_ublock.c
===================================================================
--- gnunet/src/fs/fs_publish_ublock.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/fs/fs_publish_ublock.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -252,7 +252,7 @@
GNUNET_CRYPTO_hash (&ub_enc->verification_key,
sizeof (ub_enc->verification_key),
&query);
- GNUNET_CRYPTO_ecc_key_free (nsd);
+ GNUNET_free (nsd);
uc = GNUNET_new (struct GNUNET_FS_PublishUblockContext);
uc->cont = cont;
Modified: gnunet/src/fs/fs_uri.c
===================================================================
--- gnunet/src/fs/fs_uri.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/fs/fs_uri.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -936,7 +936,7 @@
GNUNET_assert (GNUNET_OK ==
GNUNET_CRYPTO_ecc_sign (my_private_key, &ass.purpose,
&uri->data.loc.contentSignature));
- GNUNET_CRYPTO_ecc_key_free (my_private_key);
+ GNUNET_free (my_private_key);
return uri;
}
Modified: gnunet/src/fs/test_fs_namespace.c
===================================================================
--- gnunet/src/fs/test_fs_namespace.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/fs/test_fs_namespace.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -259,7 +259,7 @@
GNUNET_FS_publish_sks (fs, ns, "this", "next", meta, uri,
&bo, GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont, NULL);
GNUNET_CONTAINER_meta_data_destroy (meta);
- GNUNET_CRYPTO_ecc_key_free (ns);
+ GNUNET_free (ns);
}
@@ -291,7 +291,7 @@
NULL);
GNUNET_FS_uri_destroy (ksk_uri);
GNUNET_CONTAINER_meta_data_destroy (meta);
- GNUNET_CRYPTO_ecc_key_free (ns);
+ GNUNET_free (ns);
}
Modified: gnunet/src/fs/test_fs_namespace_list_updateable.c
===================================================================
--- gnunet/src/fs/test_fs_namespace_list_updateable.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/fs/test_fs_namespace_list_updateable.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -59,7 +59,7 @@
if (uri_next != NULL)
GNUNET_FS_uri_destroy (uri_next);
if (ns != NULL)
- GNUNET_CRYPTO_ecc_key_free (ns);
+ GNUNET_free (ns);
if (meta != NULL)
GNUNET_CONTAINER_meta_data_destroy (meta);
}
Modified: gnunet/src/fs/test_pseudonym.c
===================================================================
--- gnunet/src/fs/test_pseudonym.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/fs/test_pseudonym.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -86,7 +86,7 @@
ph = GNUNET_CRYPTO_ecc_key_create ();
GNUNET_CRYPTO_ecc_key_get_public (ph, pseu);
- GNUNET_CRYPTO_ecc_key_free (ph);
+ GNUNET_free (ph);
}
Modified: gnunet/src/gns/gnunet-gns-helper-service-w32.c
===================================================================
--- gnunet/src/gns/gnunet-gns-helper-service-w32.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/gns/gnunet-gns-helper-service-w32.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -684,7 +684,7 @@
GNUNET_CRYPTO_hash_to_enc (&user_zone, &zonename);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Using zone: %s!\n", &zonename);
- GNUNET_CRYPTO_ecc_key_free(key);
+ GNUNET_free(key);
}
GNUNET_free(keyfile);
}
Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/gns/gnunet-gns-proxy.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -3219,7 +3219,7 @@
GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Using zone: %s!\n", &zonename);
- GNUNET_CRYPTO_ecc_key_free(key);
+ GNUNET_free(key);
GNUNET_free(keyfile);
keyfile = NULL;
@@ -3247,7 +3247,7 @@
GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Using private zone: %s!\n", &zonename);
- GNUNET_CRYPTO_ecc_key_free(key);
+ GNUNET_free(key);
GNUNET_free(keyfile);
}
keyfile = NULL;
@@ -3276,7 +3276,7 @@
GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Using shorten zone: %s!\n", &zonename);
- GNUNET_CRYPTO_ecc_key_free(key);
+ GNUNET_free(key);
GNUNET_free(keyfile);
}
Modified: gnunet/src/gns/gnunet-gns.c
===================================================================
--- gnunet/src/gns/gnunet-gns.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/gns/gnunet-gns.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -162,7 +162,7 @@
/* FIXME: use identity service and/or allow user to specify public key! */
key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
if (GNUNET_OK !=
@@ -202,7 +202,7 @@
return;
}
if (NULL != shorten_key)
- GNUNET_CRYPTO_ecc_key_free (shorten_key);
+ GNUNET_free (shorten_key);
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&do_shutdown, NULL);
}
Modified: gnunet/src/gns/test_gns_cname_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_cname_lookup.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/gns/test_gns_cname_lookup.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -429,8 +429,8 @@
1, &rd,
&commence_testing,
NULL);
- GNUNET_CRYPTO_ecc_key_free(alice_key);
- GNUNET_CRYPTO_ecc_key_free(bob_key);
+ GNUNET_free(alice_key);
+ GNUNET_free(bob_key);
}
Modified: gnunet/src/gns/test_gns_dht_three_peers.c
===================================================================
--- gnunet/src/gns/test_gns_dht_three_peers.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/gns/test_gns_dht_three_peers.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -339,7 +339,7 @@
if (NULL == nh[0])
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
@@ -370,7 +370,7 @@
1, &rd,
&cont_ns, nh[0]);
- GNUNET_CRYPTO_ecc_key_free(key);
+ GNUNET_free(key);
GNUNET_free(keyfile);
GNUNET_free(web);
dave_is_setup = GNUNET_YES;
@@ -410,7 +410,7 @@
if (NULL == nh[1])
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
@@ -428,7 +428,7 @@
1, &rd,
&cont_ns, nh[1]);
- GNUNET_CRYPTO_ecc_key_free(key);
+ GNUNET_free(key);
GNUNET_free(keyfile);
bob_is_setup = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob done\n");
@@ -465,7 +465,7 @@
if (NULL == nh[2])
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
@@ -485,12 +485,12 @@
if (NULL == gh)
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to gns\n");
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
alice_is_setup = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up alice done\n");
Modified: gnunet/src/gns/test_gns_max_queries.c
===================================================================
--- gnunet/src/gns/test_gns_max_queries.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/gns/test_gns_max_queries.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -329,8 +329,8 @@
&commence_testing,
NULL);
- GNUNET_CRYPTO_ecc_key_free(alice_key);
- GNUNET_CRYPTO_ecc_key_free(bob_key);
+ GNUNET_free(alice_key);
+ GNUNET_free(bob_key);
GNUNET_free(web);
}
Modified: gnunet/src/gns/test_gns_ns_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_ns_lookup.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/gns/test_gns_ns_lookup.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -174,7 +174,7 @@
}
if (NULL != alice_key)
{
- GNUNET_CRYPTO_ecc_key_free (alice_key);
+ GNUNET_free (alice_key);
alice_key = NULL;
}
GNUNET_break (0);
@@ -229,7 +229,7 @@
}
if (NULL != alice_key)
{
- GNUNET_CRYPTO_ecc_key_free (alice_key);
+ GNUNET_free (alice_key);
alice_key = NULL;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
Modified: gnunet/src/gns/test_gns_proxy.c
===================================================================
--- gnunet/src/gns/test_gns_proxy.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/gns/test_gns_proxy.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -438,7 +438,7 @@
GNUNET_free ((void**)rd.data);
GNUNET_free (zone_keyfile);
- GNUNET_CRYPTO_ecc_key_free (host_key);
+ GNUNET_free (host_key);
}
int
Modified: gnunet/src/gns/test_gns_pseu_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_pseu_shorten.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/gns/test_gns_pseu_shorten.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -234,9 +234,9 @@
static void
commence_testing (void *cls, int success)
{
- GNUNET_CRYPTO_ecc_key_free(our_key);
- GNUNET_CRYPTO_ecc_key_free(bob_key);
- GNUNET_CRYPTO_ecc_key_free(alice_key);
+ GNUNET_free(our_key);
+ GNUNET_free(bob_key);
+ GNUNET_free(alice_key);
GNUNET_NAMESTORE_disconnect (namestore_handle);
namestore_handle = NULL;
gns_handle = GNUNET_GNS_connect(cfg);
@@ -306,9 +306,9 @@
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
ok = 3;
- GNUNET_CRYPTO_ecc_key_free(our_key);
- GNUNET_CRYPTO_ecc_key_free(bob_key);
- GNUNET_CRYPTO_ecc_key_free(alice_key);
+ GNUNET_free(our_key);
+ GNUNET_free(bob_key);
+ GNUNET_free(alice_key);
GNUNET_free(sig);
GNUNET_free (nrb);
end_badly_now ();
@@ -394,9 +394,9 @@
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
ok = 3;
- GNUNET_CRYPTO_ecc_key_free(our_key);
- GNUNET_CRYPTO_ecc_key_free(bob_key);
- GNUNET_CRYPTO_ecc_key_free(alice_key);
+ GNUNET_free(our_key);
+ GNUNET_free(bob_key);
+ GNUNET_free(alice_key);
GNUNET_free (sig);
GNUNET_free(web);
GNUNET_free (nrb);
@@ -475,9 +475,9 @@
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
ok = 3;
- GNUNET_CRYPTO_ecc_key_free (our_key);
- GNUNET_CRYPTO_ecc_key_free (bob_key);
- GNUNET_CRYPTO_ecc_key_free (alice_key);
+ GNUNET_free (our_key);
+ GNUNET_free (bob_key);
+ GNUNET_free (alice_key);
GNUNET_free (sig);
GNUNET_free (nrb);
end_badly_now ();
Modified: gnunet/src/gns/test_gns_revocation.c
===================================================================
--- gnunet/src/gns/test_gns_revocation.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/gns/test_gns_revocation.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -264,8 +264,8 @@
GNUNET_free (alice_keyfile);
GNUNET_free (web);
GNUNET_free (sig);
- GNUNET_CRYPTO_ecc_key_free (bob_key);
- GNUNET_CRYPTO_ecc_key_free (alice_key);
+ GNUNET_free (bob_key);
+ GNUNET_free (alice_key);
}
Modified: gnunet/src/gns/test_gns_simple_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_delegated_lookup.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/gns/test_gns_simple_delegated_lookup.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -259,8 +259,8 @@
NULL);
GNUNET_free (sig);
GNUNET_free (alice_keyfile);
- GNUNET_CRYPTO_ecc_key_free (bob_key);
- GNUNET_CRYPTO_ecc_key_free (alice_key);
+ GNUNET_free (bob_key);
+ GNUNET_free (alice_key);
}
Modified: gnunet/src/gns/test_gns_simple_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/gns/test_gns_simple_lookup.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -266,7 +266,7 @@
1, &rd,
&commence_testing,
NULL);
- GNUNET_CRYPTO_ecc_key_free (alice_key);
+ GNUNET_free (alice_key);
}
Modified: gnunet/src/gns/test_gns_simple_mx_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_mx_lookup.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/gns/test_gns_simple_mx_lookup.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -282,8 +282,8 @@
GNUNET_free (mx_record);
GNUNET_free (mail);
GNUNET_free (sig);
- GNUNET_CRYPTO_ecc_key_free (bob_key);
- GNUNET_CRYPTO_ecc_key_free (alice_key);
+ GNUNET_free (bob_key);
+ GNUNET_free (alice_key);
}
Modified: gnunet/src/gns/test_gns_simple_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_simple_shorten.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/gns/test_gns_simple_shorten.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -319,11 +319,11 @@
NULL);
GNUNET_free(web);
- GNUNET_CRYPTO_ecc_key_free(our_key);
- GNUNET_CRYPTO_ecc_key_free(bob_key);
- GNUNET_CRYPTO_ecc_key_free(alice_key);
- GNUNET_CRYPTO_ecc_key_free(priv_key);
- GNUNET_CRYPTO_ecc_key_free(short_key);
+ GNUNET_free(our_key);
+ GNUNET_free(bob_key);
+ GNUNET_free(alice_key);
+ GNUNET_free(priv_key);
+ GNUNET_free(short_key);
}
Modified: gnunet/src/gns/test_gns_simple_srv_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_srv_lookup.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/gns/test_gns_simple_srv_lookup.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -288,8 +288,8 @@
GNUNET_free (srv_data);
GNUNET_free (sipserver);
GNUNET_free (sig);
- GNUNET_CRYPTO_ecc_key_free (bob_key);
- GNUNET_CRYPTO_ecc_key_free (alice_key);
+ GNUNET_free (bob_key);
+ GNUNET_free (alice_key);
}
Modified: gnunet/src/gns/test_gns_simple_zkey_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_zkey_lookup.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/gns/test_gns_simple_zkey_lookup.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -273,8 +273,8 @@
GNUNET_free (alice_keyfile);
GNUNET_free (web);
GNUNET_free (sig);
- GNUNET_CRYPTO_ecc_key_free (bob_key);
- GNUNET_CRYPTO_ecc_key_free (alice_key);
+ GNUNET_free (bob_key);
+ GNUNET_free (alice_key);
}
Modified: gnunet/src/identity/gnunet-service-identity.c
===================================================================
--- gnunet/src/identity/gnunet-service-identity.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/identity/gnunet-service-identity.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -160,7 +160,7 @@
while (NULL != (e = ego_head))
{
GNUNET_CONTAINER_DLL_remove (ego_head, ego_tail, e);
- GNUNET_CRYPTO_ecc_key_free (e->pk);
+ GNUNET_free (e->pk);
GNUNET_free (e);
}
}
@@ -779,7 +779,7 @@
GNUNET_free (ego->identifier);
ego->identifier = NULL;
notify_listeners (ego);
- GNUNET_CRYPTO_ecc_key_free (ego->pk);
+ GNUNET_free (ego->pk);
GNUNET_free (ego);
send_result_code (client, 0, NULL);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
Modified: gnunet/src/identity/identity_api.c
===================================================================
--- gnunet/src/identity/identity_api.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/identity/identity_api.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -368,7 +368,7 @@
GNUNET_CONTAINER_multihashmap_remove (h->egos,
&ego->id,
ego));
- GNUNET_CRYPTO_ecc_key_free (ego->pk);
+ GNUNET_free (ego->pk);
GNUNET_free (ego->name);
GNUNET_free (ego);
}
@@ -730,7 +730,7 @@
if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct
GNUNET_IDENTITY_CreateRequestMessage))
{
GNUNET_break (0);
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
return NULL;
}
op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
@@ -753,7 +753,7 @@
op);
if (NULL == id->th)
transmit_next (id);
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
return op;
}
@@ -924,7 +924,7 @@
ego,
&ego->ctx,
NULL);
- GNUNET_CRYPTO_ecc_key_free (ego->pk);
+ GNUNET_free (ego->pk);
GNUNET_free (ego->name);
GNUNET_free (ego);
return GNUNET_OK;
Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/include/gnunet_crypto_lib.h 2013-08-21 15:34:18 UTC (rev
28758)
@@ -759,16 +759,6 @@
/**
* @ingroup crypto
- * Free memory occupied by ECC key
- *
- * @param priv pointer to the memory to free
- */
-void
-GNUNET_CRYPTO_ecc_key_free (struct GNUNET_CRYPTO_EccPrivateKey *priv);
-
-
-/**
- * @ingroup crypto
* Extract the public key for the given private key.
*
* @param priv the private key
@@ -816,7 +806,7 @@
*
* @param filename name of file to use to store the key
* @return new private key, NULL on error (for example,
- * permission denied)
+ * permission denied); free using #GNUNET_free
*/
struct GNUNET_CRYPTO_EccPrivateKey *
GNUNET_CRYPTO_ecc_key_create_from_file (const char *filename);
@@ -828,7 +818,7 @@
* the file specified in the configuration.
*
* @return new private key, NULL on error (for example,
- * permission denied)
+ * permission denied); free using #GNUNET_free
*/
struct GNUNET_CRYPTO_EccPrivateKey *
GNUNET_CRYPTO_ecc_key_create_from_configuration (const struct
GNUNET_CONFIGURATION_Handle *cfg);
@@ -838,7 +828,7 @@
* @ingroup crypto
* Create a new private key. Caller must free return value.
*
- * @return fresh private key
+ * @return fresh private key; free using #GNUNET_free
*/
struct GNUNET_CRYPTO_EccPrivateKey *
GNUNET_CRYPTO_ecc_key_create (void);
@@ -848,7 +838,7 @@
* @ingroup crypto
* Get the shared private key we use for anonymous users.
*
- * @return "anonymous" private key
+ * @return "anonymous" private key; do not free
*/
const struct GNUNET_CRYPTO_EccPrivateKey *
GNUNET_CRYPTO_ecc_key_get_anonymous (void);
Modified: gnunet/src/namestore/gnunet-namestore-fcfsd.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore-fcfsd.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/namestore/gnunet-namestore-fcfsd.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -869,7 +869,7 @@
}
if (NULL != fcfs_zone_pkey)
{
- GNUNET_CRYPTO_ecc_key_free (fcfs_zone_pkey);
+ GNUNET_free (fcfs_zone_pkey);
fcfs_zone_pkey = NULL;
}
}
Modified: gnunet/src/namestore/test_namestore_api.c
===================================================================
--- gnunet/src/namestore/test_namestore_api.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/namestore/test_namestore_api.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -58,7 +58,7 @@
}
if (NULL != privkey)
{
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
}
GNUNET_SCHEDULER_shutdown ();
Modified: gnunet/src/namestore/test_namestore_api_create.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/namestore/test_namestore_api_create.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -78,7 +78,7 @@
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
GNUNET_free_non_null (s_name);
res = 1;
@@ -98,7 +98,7 @@
GNUNET_free_non_null (s_second_record);
GNUNET_free_non_null (s_name);
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
Modified: gnunet/src/namestore/test_namestore_api_create_update.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create_update.c 2013-08-21
15:33:25 UTC (rev 28757)
+++ gnunet/src/namestore/test_namestore_api_create_update.c 2013-08-21
15:34:18 UTC (rev 28758)
@@ -81,7 +81,7 @@
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
GNUNET_free_non_null (s_name);
res = 1;
@@ -100,7 +100,7 @@
GNUNET_free (s_first_record);
GNUNET_free_non_null (s_second_record);
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
Modified: gnunet/src/namestore/test_namestore_api_lookup.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/namestore/test_namestore_api_lookup.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -70,7 +70,7 @@
}
if (NULL != privkey)
{
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
}
GNUNET_SCHEDULER_shutdown ();
Modified: gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
2013-08-21 15:34:18 UTC (rev 28758)
@@ -76,7 +76,7 @@
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
GNUNET_free_non_null (s_name);
res = 1;
@@ -100,7 +100,7 @@
GNUNET_free (s_rd);
GNUNET_free_non_null (s_name);
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
Modified: gnunet/src/namestore/test_namestore_api_monitoring.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_monitoring.c 2013-08-21
15:33:25 UTC (rev 28757)
+++ gnunet/src/namestore/test_namestore_api_monitoring.c 2013-08-21
15:34:18 UTC (rev 28758)
@@ -117,12 +117,12 @@
if (NULL != privkey)
{
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
}
if (NULL != privkey2)
{
- GNUNET_CRYPTO_ecc_key_free (privkey2);
+ GNUNET_free (privkey2);
privkey2 = NULL;
}
}
Modified: gnunet/src/namestore/test_namestore_api_put.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_put.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/namestore/test_namestore_api_put.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -66,7 +66,7 @@
if (privkey != NULL)
{
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
}
GNUNET_SCHEDULER_shutdown ();
@@ -85,7 +85,7 @@
if (privkey != NULL)
{
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
}
if (nsh != NULL)
Modified: gnunet/src/namestore/test_namestore_api_remove.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/namestore/test_namestore_api_remove.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -77,7 +77,7 @@
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
GNUNET_free_non_null (s_name);
res = 1;
@@ -98,7 +98,7 @@
GNUNET_free_non_null((void *) s_rd[c].data);
GNUNET_free (s_rd);
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
Modified: gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2013-08-21 15:34:18 UTC (rev 28758)
@@ -77,7 +77,7 @@
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
GNUNET_free_non_null (s_name);
res = 1;
@@ -99,7 +99,7 @@
GNUNET_free (s_rd);
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration.c 2013-08-21
15:33:25 UTC (rev 28757)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration.c 2013-08-21
15:34:18 UTC (rev 28758)
@@ -117,11 +117,11 @@
}
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (privkey2 != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey2);
+ GNUNET_free (privkey2);
privkey2 = NULL;
res = 1;
}
@@ -143,11 +143,11 @@
}
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (privkey2 != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey2);
+ GNUNET_free (privkey2);
privkey2 = NULL;
GNUNET_free (sig_1);
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2013-08-21 15:34:18 UTC (rev 28758)
@@ -115,11 +115,11 @@
}
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (privkey2 != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey2);
+ GNUNET_free (privkey2);
privkey2 = NULL;
res = 1;
}
@@ -139,10 +139,10 @@
endbadly_task = GNUNET_SCHEDULER_NO_TASK;
}
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (privkey2 != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey2);
+ GNUNET_free (privkey2);
privkey2 = NULL;
GNUNET_free (sig_1);
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2013-08-21 15:34:18 UTC (rev 28758)
@@ -112,11 +112,11 @@
GNUNET_free (s_rd_3);
}
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (privkey2 != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey2);
+ GNUNET_free (privkey2);
privkey2 = NULL;
res = 1;
}
@@ -137,10 +137,10 @@
endbadly_task = GNUNET_SCHEDULER_NO_TASK;
}
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (privkey2 != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey2);
+ GNUNET_free (privkey2);
privkey2 = NULL;
GNUNET_free (sig_1);
Modified: gnunet/src/namestore/test_namestore_api_zone_to_name.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_to_name.c 2013-08-21
15:33:25 UTC (rev 28757)
+++ gnunet/src/namestore/test_namestore_api_zone_to_name.c 2013-08-21
15:34:18 UTC (rev 28758)
@@ -73,7 +73,7 @@
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
res = 1;
}
@@ -88,7 +88,7 @@
endbadly_task = GNUNET_SCHEDULER_NO_TASK;
}
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/nse/gnunet-service-nse.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -1325,7 +1325,7 @@
}
if (NULL != my_private_key)
{
- GNUNET_CRYPTO_ecc_key_free (my_private_key);
+ GNUNET_free (my_private_key);
my_private_key = NULL;
}
#if ENABLE_NSE_HISTOGRAM
@@ -1471,7 +1471,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("NSE service is lacking key configuration settings.
Exiting.\n"));
- GNUNET_CRYPTO_ecc_key_free (my_private_key);
+ GNUNET_free (my_private_key);
my_private_key = NULL;
GNUNET_SCHEDULER_shutdown ();
return;
Modified: gnunet/src/peerinfo-tool/gnunet-peerinfo.c
===================================================================
--- gnunet/src/peerinfo-tool/gnunet-peerinfo.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/peerinfo-tool/gnunet-peerinfo.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -678,7 +678,7 @@
}
GNUNET_free (fn);
GNUNET_CRYPTO_ecc_key_get_public (priv, &my_public_key);
- GNUNET_CRYPTO_ecc_key_free (priv);
+ GNUNET_free (priv);
GNUNET_CRYPTO_hash (&my_public_key, sizeof (my_public_key),
&my_peer_identity.hashPubKey);
}
Modified: gnunet/src/pt/test_gns_vpn.c
===================================================================
--- gnunet/src/pt/test_gns_vpn.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/pt/test_gns_vpn.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -410,7 +410,7 @@
GNUNET_free ((void**)rd.data);
GNUNET_free (rd_string);
GNUNET_free (zone_keyfile);
- GNUNET_CRYPTO_ecc_key_free (host_key);
+ GNUNET_free (host_key);
}
Modified: gnunet/src/regex/gnunet-daemon-regexprofiler.c
===================================================================
--- gnunet/src/regex/gnunet-daemon-regexprofiler.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/regex/gnunet-daemon-regexprofiler.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -124,7 +124,7 @@
GNUNET_DHT_disconnect (dht_handle);
dht_handle = NULL;
}
- GNUNET_CRYPTO_ecc_key_free (my_private_key);
+ GNUNET_free (my_private_key);
my_private_key = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
Modified: gnunet/src/regex/gnunet-service-regex.c
===================================================================
--- gnunet/src/regex/gnunet-service-regex.c 2013-08-21 15:33:25 UTC (rev
28757)
+++ gnunet/src/regex/gnunet-service-regex.c 2013-08-21 15:34:18 UTC (rev
28758)
@@ -120,7 +120,7 @@
stats = NULL;
GNUNET_SERVER_notification_context_destroy (nc);
nc = NULL;
- GNUNET_CRYPTO_ecc_key_free (my_private_key);
+ GNUNET_free (my_private_key);
my_private_key = NULL;
}
@@ -371,7 +371,7 @@
dht = GNUNET_DHT_connect (cfg, 1024);
if (NULL == dht)
{
- GNUNET_CRYPTO_ecc_key_free (my_private_key);
+ GNUNET_free (my_private_key);
my_private_key = NULL;
GNUNET_SCHEDULER_shutdown ();
return;
Modified: gnunet/src/testing/gnunet-testing.c
===================================================================
--- gnunet/src/testing/gnunet-testing.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/testing/gnunet-testing.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -143,7 +143,7 @@
GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fd));
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
"Wrote hostkey to file: `%s'\n", create_hostkey);
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
GNUNET_TESTING_system_destroy (system, GNUNET_YES);
return 0;
}
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/testing/testing.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -1169,7 +1169,7 @@
goto err_ret;
}
if (NULL != pk)
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
if (GNUNET_NO ==
GNUNET_CONFIGURATION_have_value (cfg, "PEER", "PRIVATE_KEY"))
{
@@ -1288,7 +1288,7 @@
return;
}
peer->id = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
- GNUNET_CRYPTO_ecc_key_free (GNUNET_TESTING_hostkey_get (peer->system,
+ GNUNET_free (GNUNET_TESTING_hostkey_get (peer->system,
peer->key_number,
peer->id));
memcpy (id, peer->id, sizeof (struct GNUNET_PeerIdentity));
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2013-08-21 15:33:25 UTC
(rev 28757)
+++ gnunet/src/transport/gnunet-service-transport.c 2013-08-21 15:34:18 UTC
(rev 28758)
@@ -718,7 +718,7 @@
}
if (NULL != GST_my_private_key)
{
- GNUNET_CRYPTO_ecc_key_free (GST_my_private_key);
+ GNUNET_free (GST_my_private_key);
GST_my_private_key = NULL;
}
GST_server = NULL;
Modified: gnunet/src/util/crypto_ecc.c
===================================================================
--- gnunet/src/util/crypto_ecc.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/util/crypto_ecc.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -53,18 +53,6 @@
/**
- * Free memory occupied by ECC key
- *
- * @param priv pointer to the memory to free
- */
-void
-GNUNET_CRYPTO_ecc_key_free (struct GNUNET_CRYPTO_EccPrivateKey *priv)
-{
- GNUNET_free (priv);
-}
-
-
-/**
* Extract values from an S-expression.
*
* @param array where to store the result(s)
@@ -668,7 +656,7 @@
(void) GNUNET_CONFIGURATION_load (cfg, cfg_name);
priv = GNUNET_CRYPTO_ecc_key_create_from_configuration (cfg);
if (NULL != priv)
- GNUNET_CRYPTO_ecc_key_free (priv);
+ GNUNET_free (priv);
GNUNET_CONFIGURATION_destroy (cfg);
}
@@ -695,7 +683,7 @@
return GNUNET_SYSERR;
}
GNUNET_CRYPTO_ecc_key_get_public (priv, &pub);
- GNUNET_CRYPTO_ecc_key_free (priv);
+ GNUNET_free (priv);
GNUNET_CRYPTO_hash (&pub, sizeof (pub), &dst->hashPubKey);
return GNUNET_OK;
}
Modified: gnunet/src/util/gnunet-ecc.c
===================================================================
--- gnunet/src/util/gnunet-ecc.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/util/gnunet-ecc.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -82,10 +82,10 @@
_("\nFailed to write to `%s': %s\n"),
fn,
STRERROR (errno));
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
break;
}
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
}
if (UINT_MAX == make_keys)
fprintf (stderr,
@@ -144,7 +144,7 @@
GNUNET_CRYPTO_hash_to_enc (&pid.hashPubKey, &enc);
fprintf (stdout, "%s\n", enc.encoding);
}
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
}
Modified: gnunet/src/util/test_crypto_ecc.c
===================================================================
--- gnunet/src/util/test_crypto_ecc.c 2013-08-21 15:33:25 UTC (rev 28757)
+++ gnunet/src/util/test_crypto_ecc.c 2013-08-21 15:34:18 UTC (rev 28758)
@@ -104,7 +104,7 @@
if (GNUNET_SYSERR == GNUNET_CRYPTO_ecc_sign (dpriv, &purp, &sig))
{
FPRINTF (stderr, "%s", "GNUNET_CRYPTO_ecc_sign returned SYSERR\n");
- GNUNET_CRYPTO_ecc_key_free (dpriv);
+ GNUNET_free (dpriv);
return GNUNET_SYSERR;
}
if (GNUNET_SYSERR ==
@@ -113,7 +113,7 @@
&dpub))
{
printf ("GNUNET_CRYPTO_ecc_verify failed!\n");
- GNUNET_CRYPTO_ecc_key_free (dpriv);
+ GNUNET_free (dpriv);
return GNUNET_SYSERR;
}
if (GNUNET_SYSERR !=
@@ -122,7 +122,7 @@
&pkey))
{
printf ("GNUNET_CRYPTO_ecc_verify failed to fail!\n");
- GNUNET_CRYPTO_ecc_key_free (dpriv);
+ GNUNET_free (dpriv);
return GNUNET_SYSERR;
}
if (GNUNET_SYSERR !=
@@ -130,10 +130,10 @@
&purp, &sig, &dpub))
{
printf ("GNUNET_CRYPTO_ecc_verify failed to fail!\n");
- GNUNET_CRYPTO_ecc_key_free (dpriv);
+ GNUNET_free (dpriv);
return GNUNET_SYSERR;
}
- GNUNET_CRYPTO_ecc_key_free (dpriv);
+ GNUNET_free (dpriv);
return GNUNET_OK;
}
@@ -183,18 +183,18 @@
key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE);
GNUNET_assert (NULL != key);
GNUNET_CRYPTO_ecc_key_get_public (key, &p1);
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE);
GNUNET_assert (NULL != key);
GNUNET_CRYPTO_ecc_key_get_public (key, &p2);
GNUNET_assert (0 == memcmp (&p1, &p2, sizeof (p1)));
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_assert (0 == UNLINK (KEYFILE));
key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE);
GNUNET_assert (NULL != key);
GNUNET_CRYPTO_ecc_key_get_public (key, &p2);
GNUNET_assert (0 != memcmp (&p1, &p2, sizeof (p1)));
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
return GNUNET_OK;
}
@@ -217,8 +217,8 @@
GNUNET_CRYPTO_ecc_ecdh (priv2, &pub1, &ecdh2);
GNUNET_assert (0 == memcmp (&ecdh1, &ecdh2,
sizeof (struct GNUNET_HashCode)));
- GNUNET_CRYPTO_ecc_key_free (priv1);
- GNUNET_CRYPTO_ecc_key_free (priv2);
+ GNUNET_free (priv1);
+ GNUNET_free (priv2);
}
@@ -234,7 +234,7 @@
{
fprintf (stderr, ".");
pk = GNUNET_CRYPTO_ecc_key_create ();
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
}
fprintf (stderr, "\n");
printf ("Creating 10 ECC keys took %s\n",
@@ -270,7 +270,7 @@
#endif
if (GNUNET_OK != testSignVerify ())
failure_count++;
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
if (GNUNET_OK != testCreateFromFile ())
failure_count++;
GNUNET_assert (0 == UNLINK (KEYFILE));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28758 - in gnunet/src: core fs gns identity include namestore nse peerinfo-tool pt regex testing transport util,
gnunet <=