diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-02-05 20:49:21 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-02-05 20:49:21 +0000 |
commit | ca35f67faee8371fa763bdf49f04a8d5d4cdc021 (patch) | |
tree | 5535df5e5a2428ed838c6a0e60b2c6c68a7842c5 /src/core/gnunet-service-core.c | |
parent | dd7cca21c5dbaef4d56f92bab3932f0f73d092d1 (diff) | |
download | gnunet-ca35f67faee8371fa763bdf49f04a8d5d4cdc021.tar.gz gnunet-ca35f67faee8371fa763bdf49f04a8d5d4cdc021.zip |
switching to ECDHE cryptography f, implementation is incomplete and INSECURE, do not use for anything but testing
Diffstat (limited to 'src/core/gnunet-service-core.c')
-rw-r--r-- | src/core/gnunet-service-core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 095e12405..2be833fa0 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c | |||
@@ -56,7 +56,7 @@ static struct GNUNET_SERVER_Handle *GSC_server; | |||
56 | /** | 56 | /** |
57 | * Hostkey generation context | 57 | * Hostkey generation context |
58 | */ | 58 | */ |
59 | static struct GNUNET_CRYPTO_RsaKeyGenerationContext *keygen; | 59 | static struct GNUNET_CRYPTO_EccKeyGenerationContext *keygen; |
60 | 60 | ||
61 | 61 | ||
62 | /** | 62 | /** |
@@ -72,7 +72,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
72 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core service shutting down.\n"); | 72 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core service shutting down.\n"); |
73 | if (NULL != keygen) | 73 | if (NULL != keygen) |
74 | { | 74 | { |
75 | GNUNET_CRYPTO_rsa_key_create_stop (keygen); | 75 | GNUNET_CRYPTO_ecc_key_create_stop (keygen); |
76 | keygen = NULL; | 76 | keygen = NULL; |
77 | } | 77 | } |
78 | GSC_CLIENTS_done (); | 78 | GSC_CLIENTS_done (); |
@@ -99,14 +99,14 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
99 | */ | 99 | */ |
100 | static void | 100 | static void |
101 | key_generation_cb (void *cls, | 101 | key_generation_cb (void *cls, |
102 | struct GNUNET_CRYPTO_RsaPrivateKey *pk, | 102 | struct GNUNET_CRYPTO_EccPrivateKey *pk, |
103 | const char *emsg) | 103 | const char *emsg) |
104 | { | 104 | { |
105 | keygen = NULL; | 105 | keygen = NULL; |
106 | if (NULL == pk) | 106 | if (NULL == pk) |
107 | { | 107 | { |
108 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 108 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
109 | _("Failed to read hostkey: %s\n"), | 109 | _("Failed to read or generate private key: %s\n"), |
110 | emsg); | 110 | emsg); |
111 | GNUNET_SCHEDULER_shutdown (); | 111 | GNUNET_SCHEDULER_shutdown (); |
112 | return; | 112 | return; |
@@ -141,7 +141,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
141 | GSC_cfg = c; | 141 | GSC_cfg = c; |
142 | GSC_server = server; | 142 | GSC_server = server; |
143 | if (GNUNET_OK != | 143 | if (GNUNET_OK != |
144 | GNUNET_CONFIGURATION_get_value_filename (GSC_cfg, "GNUNETD", "HOSTKEY", | 144 | GNUNET_CONFIGURATION_get_value_filename (GSC_cfg, "PEER", "PRIVATE_KEY", |
145 | &keyfile)) | 145 | &keyfile)) |
146 | { | 146 | { |
147 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 147 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -155,7 +155,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
155 | NULL); | 155 | NULL); |
156 | GNUNET_SERVER_suspend (server); | 156 | GNUNET_SERVER_suspend (server); |
157 | GSC_TYPEMAP_init (); | 157 | GSC_TYPEMAP_init (); |
158 | keygen = GNUNET_CRYPTO_rsa_key_create_start (keyfile, &key_generation_cb, NULL); | 158 | keygen = GNUNET_CRYPTO_ecc_key_create_start (keyfile, &key_generation_cb, NULL); |
159 | GNUNET_free (keyfile); | 159 | GNUNET_free (keyfile); |
160 | if (NULL == keygen) | 160 | if (NULL == keygen) |
161 | { | 161 | { |