diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-04-11 21:43:28 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-04-11 21:43:34 +0200 |
commit | 90ff9edfa9c5fcfa3a36d1653ff105e89b888e21 (patch) | |
tree | 780a2071f5072c8e8e044db741eb295c3f3ea2a7 /src/util/gnunet-scrypt.c | |
parent | 3bcfe59f1ce533246bda271f00b3ee957cae304d (diff) | |
download | gnunet-90ff9edfa9c5fcfa3a36d1653ff105e89b888e21.tar.gz gnunet-90ff9edfa9c5fcfa3a36d1653ff105e89b888e21.zip |
fixing #6149
Diffstat (limited to 'src/util/gnunet-scrypt.c')
-rw-r--r-- | src/util/gnunet-scrypt.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c index bc8ce83c0..8c46136b9 100644 --- a/src/util/gnunet-scrypt.c +++ b/src/util/gnunet-scrypt.c | |||
@@ -174,7 +174,7 @@ run (void *cls, | |||
174 | const char *cfgfile, | 174 | const char *cfgfile, |
175 | const struct GNUNET_CONFIGURATION_Handle *config) | 175 | const struct GNUNET_CONFIGURATION_Handle *config) |
176 | { | 176 | { |
177 | struct GNUNET_CRYPTO_EddsaPrivateKey *pk; | 177 | struct GNUNET_CRYPTO_EddsaPrivateKey pk; |
178 | char *pids; | 178 | char *pids; |
179 | 179 | ||
180 | (void) cls; | 180 | (void) cls; |
@@ -214,15 +214,18 @@ run (void *cls, | |||
214 | } | 214 | } |
215 | } | 215 | } |
216 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Private Key file: %s\n", pkfn); | 216 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Private Key file: %s\n", pkfn); |
217 | if (NULL == (pk = GNUNET_CRYPTO_eddsa_key_create_from_file (pkfn))) | 217 | if (GNUNET_SYSERR == |
218 | GNUNET_CRYPTO_eddsa_key_from_file (pkfn, | ||
219 | GNUNET_YES, | ||
220 | &pk)) | ||
218 | { | 221 | { |
219 | fprintf (stderr, _ ("Loading hostkey from `%s' failed.\n"), pkfn); | 222 | fprintf (stderr, _ ("Loading hostkey from `%s' failed.\n"), pkfn); |
220 | GNUNET_free (pkfn); | 223 | GNUNET_free (pkfn); |
221 | return; | 224 | return; |
222 | } | 225 | } |
223 | GNUNET_free (pkfn); | 226 | GNUNET_free (pkfn); |
224 | GNUNET_CRYPTO_eddsa_key_get_public (pk, &pub); | 227 | GNUNET_CRYPTO_eddsa_key_get_public (&pk, |
225 | GNUNET_free (pk); | 228 | &pub); |
226 | pids = GNUNET_CRYPTO_eddsa_public_key_to_string (&pub); | 229 | pids = GNUNET_CRYPTO_eddsa_public_key_to_string (&pub); |
227 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Peer ID: %s\n", pids); | 230 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Peer ID: %s\n", pids); |
228 | GNUNET_free (pids); | 231 | GNUNET_free (pids); |