diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-14 22:15:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-14 22:15:55 +0000 |
commit | 6c8fa85819a2b02b3c4a175a08c1779283eda209 (patch) | |
tree | 3d635a2aa58f321fbb8779b6e086113558dc1c52 /src/include/gnunet_fs_service.h | |
parent | 6d7c1dd00a193fc054d1f1588ae7c98dc95b6257 (diff) | |
download | gnunet-6c8fa85819a2b02b3c4a175a08c1779283eda209.tar.gz gnunet-6c8fa85819a2b02b3c4a175a08c1779283eda209.zip |
fix key management issue with LOC signing identified in #3559
Diffstat (limited to 'src/include/gnunet_fs_service.h')
-rw-r--r-- | src/include/gnunet_fs_service.h | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index 9f3ff0d12..9ea278d87 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h | |||
@@ -162,7 +162,8 @@ GNUNET_FS_uri_ksk_remove_keyword (struct GNUNET_FS_Uri *uri, | |||
162 | * @return NULL on error | 162 | * @return NULL on error |
163 | */ | 163 | */ |
164 | struct GNUNET_FS_Uri * | 164 | struct GNUNET_FS_Uri * |
165 | GNUNET_FS_uri_parse (const char *uri, char **emsg); | 165 | GNUNET_FS_uri_parse (const char *uri, |
166 | char **emsg); | ||
166 | 167 | ||
167 | 168 | ||
168 | /** | 169 | /** |
@@ -233,15 +234,19 @@ GNUNET_FS_uri_loc_get_expiration (const struct GNUNET_FS_Uri *uri); | |||
233 | 234 | ||
234 | /** | 235 | /** |
235 | * Construct a location URI (this peer will be used for the location). | 236 | * Construct a location URI (this peer will be used for the location). |
237 | * This function should only be called from within gnunet-service-fs, | ||
238 | * as it requires the peer's private key which is generally unavailable | ||
239 | * to processes directly under the user's control. However, for | ||
240 | * testing and as it logically fits under URIs, it is in this API. | ||
236 | * | 241 | * |
237 | * @param baseUri content offered by the sender | 242 | * @param base_uri content offered by the sender |
238 | * @param cfg configuration information (used to find our hostkey) | 243 | * @param sign_key private key of the peer |
239 | * @param expiration_time how long will the content be offered? | 244 | * @param expiration_time how long will the content be offered? |
240 | * @return the location URI, NULL on error | 245 | * @return the location URI, NULL on error |
241 | */ | 246 | */ |
242 | struct GNUNET_FS_Uri * | 247 | struct GNUNET_FS_Uri * |
243 | GNUNET_FS_uri_loc_create (const struct GNUNET_FS_Uri *baseUri, | 248 | GNUNET_FS_uri_loc_create (const struct GNUNET_FS_Uri *base_uri, |
244 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 249 | const struct GNUNET_CRYPTO_EddsaPrivateKey *sign_key, |
245 | struct GNUNET_TIME_Absolute expiration_time); | 250 | struct GNUNET_TIME_Absolute expiration_time); |
246 | 251 | ||
247 | 252 | ||
@@ -285,7 +290,8 @@ GNUNET_FS_uri_dup (const struct GNUNET_FS_Uri *uri); | |||
285 | * if keywords is not legal (i.e. empty). | 290 | * if keywords is not legal (i.e. empty). |
286 | */ | 291 | */ |
287 | struct GNUNET_FS_Uri * | 292 | struct GNUNET_FS_Uri * |
288 | GNUNET_FS_uri_ksk_create (const char *keywords, char **emsg); | 293 | GNUNET_FS_uri_ksk_create (const char *keywords, |
294 | char **emsg); | ||
289 | 295 | ||
290 | 296 | ||
291 | /** | 297 | /** |
@@ -436,8 +442,9 @@ GNUNET_FS_uri_ksk_create_from_meta_data (const struct GNUNET_CONTAINER_MetaData | |||
436 | * @return #GNUNET_OK on success | 442 | * @return #GNUNET_OK on success |
437 | */ | 443 | */ |
438 | int | 444 | int |
439 | GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext | 445 | GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, |
440 | *ctx, void *scls, const char *option, | 446 | void *scls, |
447 | const char *option, | ||
441 | const char *value); | 448 | const char *value); |
442 | 449 | ||
443 | 450 | ||
@@ -454,8 +461,9 @@ GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext | |||
454 | * @return #GNUNET_OK on success | 461 | * @return #GNUNET_OK on success |
455 | */ | 462 | */ |
456 | int | 463 | int |
457 | GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext | 464 | GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, |
458 | *ctx, void *scls, const char *option, | 465 | void *scls, |
466 | const char *option, | ||
459 | const char *value); | 467 | const char *value); |
460 | 468 | ||
461 | 469 | ||