diff options
Diffstat (limited to 'src/escrow/escrow_api.c')
-rw-r--r-- | src/escrow/escrow_api.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/escrow/escrow_api.c b/src/escrow/escrow_api.c index 5bd615c2d..4b3f5e68d 100644 --- a/src/escrow/escrow_api.c +++ b/src/escrow/escrow_api.c | |||
@@ -245,7 +245,7 @@ handle_start_escrow_result (void *cls) | |||
245 | } | 245 | } |
246 | GNUNET_CONTAINER_DLL_remove (w->h->op_head, w->h->op_tail, op); | 246 | GNUNET_CONTAINER_DLL_remove (w->h->op_head, w->h->op_tail, op); |
247 | if (NULL != op->cb_put) | 247 | if (NULL != op->cb_put) |
248 | op->cb_put (op->cb_cls, w->escrowAnchor, w->emsg); | 248 | op->cb_put (op->cb_cls, w->anchor, w->emsg); |
249 | GNUNET_free (op); | 249 | GNUNET_free (op); |
250 | } | 250 | } |
251 | 251 | ||
@@ -378,7 +378,7 @@ handle_verify_escrow_result (void *cls) | |||
378 | * | 378 | * |
379 | * @param h the handle for the escrow component | 379 | * @param h the handle for the escrow component |
380 | * @param ego the identity ego that was put into escrow | 380 | * @param ego the identity ego that was put into escrow |
381 | * @param escrowAnchor the escrow anchor returned by the GNUNET_ESCROW_put method | 381 | * @param anchor the escrow anchor returned by the GNUNET_ESCROW_put method |
382 | * @param method the escrow method to use | 382 | * @param method the escrow method to use |
383 | * @param cb function to call with the verification result on completion | 383 | * @param cb function to call with the verification result on completion |
384 | * @param cb_cls closure for @a cb | 384 | * @param cb_cls closure for @a cb |
@@ -388,7 +388,7 @@ handle_verify_escrow_result (void *cls) | |||
388 | struct GNUNET_ESCROW_Operation * | 388 | struct GNUNET_ESCROW_Operation * |
389 | GNUNET_ESCROW_verify (struct GNUNET_ESCROW_Handle *h, | 389 | GNUNET_ESCROW_verify (struct GNUNET_ESCROW_Handle *h, |
390 | struct GNUNET_IDENTITY_Ego *ego, | 390 | struct GNUNET_IDENTITY_Ego *ego, |
391 | struct GNUNET_ESCROW_Anchor *escrowAnchor, | 391 | struct GNUNET_ESCROW_Anchor *anchor, |
392 | enum GNUNET_ESCROW_Key_Escrow_Method method, | 392 | enum GNUNET_ESCROW_Key_Escrow_Method method, |
393 | GNUNET_ESCROW_VerifyContinuation cb, | 393 | GNUNET_ESCROW_VerifyContinuation cb, |
394 | void *cb_cls) | 394 | void *cb_cls) |
@@ -405,7 +405,7 @@ GNUNET_ESCROW_verify (struct GNUNET_ESCROW_Handle *h, | |||
405 | GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op); | 405 | GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op); |
406 | 406 | ||
407 | api = init_plugin (h, method); | 407 | api = init_plugin (h, method); |
408 | op->plugin_op_wrap = api->verify_key_escrow (h, ego, escrowAnchor, &handle_verify_escrow_result, op->id); | 408 | op->plugin_op_wrap = api->verify_key_escrow (h, ego, anchor, &handle_verify_escrow_result, op->id); |
409 | 409 | ||
410 | return op; | 410 | return op; |
411 | } | 411 | } |
@@ -511,23 +511,23 @@ GNUNET_ESCROW_anchor_string_to_data (const char *anchorString) | |||
511 | /** | 511 | /** |
512 | * Serialize an escrow anchor (struct GNUNET_ESCROW_Anchor) into a string | 512 | * Serialize an escrow anchor (struct GNUNET_ESCROW_Anchor) into a string |
513 | * | 513 | * |
514 | * @param escrowAnchor the escrow anchor struct | 514 | * @param anchor the escrow anchor struct |
515 | * | 515 | * |
516 | * @return the encoded escrow anchor string | 516 | * @return the encoded escrow anchor string |
517 | */ | 517 | */ |
518 | char * | 518 | char * |
519 | GNUNET_ESCROW_anchor_data_to_string (const struct GNUNET_ESCROW_Anchor *escrowAnchor) | 519 | GNUNET_ESCROW_anchor_data_to_string (const struct GNUNET_ESCROW_Anchor *anchor) |
520 | { | 520 | { |
521 | char *anchorString, *ptr; | 521 | char *anchorString, *ptr; |
522 | const char *methodString, *egoNameString, *anchorData; | 522 | const char *methodString, *egoNameString, *anchorData; |
523 | char *methodStringEnc, *egoNameStringEnc, *anchorDataEnc; | 523 | char *methodStringEnc, *egoNameStringEnc, *anchorDataEnc; |
524 | 524 | ||
525 | methodString = GNUNET_ESCROW_method_number_to_string (escrowAnchor->method); | 525 | methodString = GNUNET_ESCROW_method_number_to_string (anchor->method); |
526 | GNUNET_STRINGS_urlencode (methodString, strlen (methodString), &methodStringEnc); | 526 | GNUNET_STRINGS_urlencode (methodString, strlen (methodString), &methodStringEnc); |
527 | egoNameString = escrowAnchor->egoName; | 527 | egoNameString = anchor->egoName; |
528 | GNUNET_STRINGS_urlencode (egoNameString, strlen (egoNameString), &egoNameStringEnc); | 528 | GNUNET_STRINGS_urlencode (egoNameString, strlen (egoNameString), &egoNameStringEnc); |
529 | anchorData = (const char *)&escrowAnchor[1]; | 529 | anchorData = (const char *)&anchor[1]; |
530 | GNUNET_STRINGS_urlencode (anchorData, escrowAnchor->size, &anchorDataEnc); | 530 | GNUNET_STRINGS_urlencode (anchorData, anchor->size, &anchorDataEnc); |
531 | 531 | ||
532 | anchorString = GNUNET_malloc (strlen (methodStringEnc) + 1 | 532 | anchorString = GNUNET_malloc (strlen (methodStringEnc) + 1 |
533 | + strlen (egoNameStringEnc) + 1 | 533 | + strlen (egoNameStringEnc) + 1 |