diff options
Diffstat (limited to 'src/credential')
-rw-r--r-- | src/credential/gnunet-service-credential.c | 48 | ||||
-rw-r--r-- | src/credential/plugin_gnsrecord_credential.c | 10 | ||||
-rw-r--r-- | src/credential/plugin_rest_credential.c | 36 |
3 files changed, 49 insertions, 45 deletions
diff --git a/src/credential/gnunet-service-credential.c b/src/credential/gnunet-service-credential.c index 399371a2e..29bdf63d8 100644 --- a/src/credential/gnunet-service-credential.c +++ b/src/credential/gnunet-service-credential.c | |||
@@ -61,17 +61,17 @@ struct DelegationChainEntry | |||
61 | * The issuer | 61 | * The issuer |
62 | */ | 62 | */ |
63 | struct GNUNET_CRYPTO_EcdsaPublicKey issuer_key; | 63 | struct GNUNET_CRYPTO_EcdsaPublicKey issuer_key; |
64 | 64 | ||
65 | /** | 65 | /** |
66 | * The subject | 66 | * The subject |
67 | */ | 67 | */ |
68 | struct GNUNET_CRYPTO_EcdsaPublicKey subject_key; | 68 | struct GNUNET_CRYPTO_EcdsaPublicKey subject_key; |
69 | 69 | ||
70 | /** | 70 | /** |
71 | * The issued attribute | 71 | * The issued attribute |
72 | */ | 72 | */ |
73 | char *issuer_attribute; | 73 | char *issuer_attribute; |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * The delegated attribute | 76 | * The delegated attribute |
77 | */ | 77 | */ |
@@ -92,7 +92,7 @@ struct CredentialRecordEntry | |||
92 | * DLL | 92 | * DLL |
93 | */ | 93 | */ |
94 | struct CredentialRecordEntry *prev; | 94 | struct CredentialRecordEntry *prev; |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * Number of references in delegation chains | 97 | * Number of references in delegation chains |
98 | */ | 98 | */ |
@@ -409,7 +409,7 @@ cleanup_handle (struct VerifyRequestHandle *vrh) | |||
409 | } | 409 | } |
410 | cleanup_delegation_set (vrh->root_set); | 410 | cleanup_delegation_set (vrh->root_set); |
411 | GNUNET_free_non_null (vrh->issuer_attribute); | 411 | GNUNET_free_non_null (vrh->issuer_attribute); |
412 | for (cr_entry = vrh->cred_chain_head; | 412 | for (cr_entry = vrh->cred_chain_head; |
413 | NULL != vrh->cred_chain_head; | 413 | NULL != vrh->cred_chain_head; |
414 | cr_entry = vrh->cred_chain_head) | 414 | cr_entry = vrh->cred_chain_head) |
415 | { | 415 | { |
@@ -543,7 +543,7 @@ send_lookup_response (struct VerifyRequestHandle *vrh) | |||
543 | else | 543 | else |
544 | rmsg->cred_found = htonl (GNUNET_NO); | 544 | rmsg->cred_found = htonl (GNUNET_NO); |
545 | 545 | ||
546 | GNUNET_assert (-1 != | 546 | GNUNET_assert (-1 != |
547 | GNUNET_CREDENTIAL_delegation_chain_serialize (vrh->delegation_chain_size, | 547 | GNUNET_CREDENTIAL_delegation_chain_serialize (vrh->delegation_chain_size, |
548 | dd, | 548 | dd, |
549 | vrh->cred_chain_size, | 549 | vrh->cred_chain_size, |
@@ -587,7 +587,7 @@ backward_resolution (void* cls, | |||
587 | "Got %d attrs\n", rd_count); | 587 | "Got %d attrs\n", rd_count); |
588 | 588 | ||
589 | // Each OR | 589 | // Each OR |
590 | for (uint32_t i=0; i < rd_count; i++) | 590 | for (uint32_t i=0; i < rd_count; i++) |
591 | { | 591 | { |
592 | if (GNUNET_GNSRECORD_TYPE_ATTRIBUTE != rd[i].record_type) | 592 | if (GNUNET_GNSRECORD_TYPE_ATTRIBUTE != rd[i].record_type) |
593 | continue; | 593 | continue; |
@@ -665,10 +665,10 @@ backward_resolution (void* cls, | |||
665 | /** | 665 | /** |
666 | * Check if this delegation already matches one of our credentials | 666 | * Check if this delegation already matches one of our credentials |
667 | */ | 667 | */ |
668 | for(cred_pointer = vrh->cred_chain_head; cred_pointer != NULL; | 668 | for(cred_pointer = vrh->cred_chain_head; cred_pointer != NULL; |
669 | cred_pointer = cred_pointer->next) | 669 | cred_pointer = cred_pointer->next) |
670 | { | 670 | { |
671 | if(0 != memcmp (&set->subject_key, | 671 | if(0 != memcmp (&set->subject_key, |
672 | &cred_pointer->credential->issuer_key, | 672 | &cred_pointer->credential->issuer_key, |
673 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey))) | 673 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey))) |
674 | continue; | 674 | continue; |
@@ -769,7 +769,7 @@ backward_resolution (void* cls, | |||
769 | return; | 769 | return; |
770 | 770 | ||
771 | } | 771 | } |
772 | } | 772 | } |
773 | 773 | ||
774 | 774 | ||
775 | /** | 775 | /** |
@@ -809,7 +809,7 @@ delegation_chain_resolution_start (void* cls) | |||
809 | } | 809 | } |
810 | 810 | ||
811 | /** | 811 | /** |
812 | * Check for attributes from the issuer and follow the chain | 812 | * Check for attributes from the issuer and follow the chain |
813 | * till you get the required subject's attributes | 813 | * till you get the required subject's attributes |
814 | */ | 814 | */ |
815 | char issuer_attribute_name[strlen (vrh->issuer_attribute) + strlen (".gnu") + 1]; | 815 | char issuer_attribute_name[strlen (vrh->issuer_attribute) + strlen (".gnu") + 1]; |
@@ -821,9 +821,9 @@ delegation_chain_resolution_start (void* cls) | |||
821 | "Looking up %s\n", issuer_attribute_name); | 821 | "Looking up %s\n", issuer_attribute_name); |
822 | ds_entry = GNUNET_new (struct DelegationSetQueueEntry); | 822 | ds_entry = GNUNET_new (struct DelegationSetQueueEntry); |
823 | ds_entry->issuer_key = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey); | 823 | ds_entry->issuer_key = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey); |
824 | memcpy (ds_entry->issuer_key, | 824 | GNUNET_memcpy (ds_entry->issuer_key, |
825 | &vrh->issuer_key, | 825 | &vrh->issuer_key, |
826 | sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)); | 826 | sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)); |
827 | ds_entry->issuer_attribute = GNUNET_strdup (vrh->issuer_attribute); | 827 | ds_entry->issuer_attribute = GNUNET_strdup (vrh->issuer_attribute); |
828 | ds_entry->handle = vrh; | 828 | ds_entry->handle = vrh; |
829 | ds_entry->lookup_attribute = GNUNET_strdup (vrh->issuer_attribute); | 829 | ds_entry->lookup_attribute = GNUNET_strdup (vrh->issuer_attribute); |
@@ -869,7 +869,7 @@ check_verify (void *cls, | |||
869 | 869 | ||
870 | static void | 870 | static void |
871 | handle_verify (void *cls, | 871 | handle_verify (void *cls, |
872 | const struct VerifyMessage *v_msg) | 872 | const struct VerifyMessage *v_msg) |
873 | { | 873 | { |
874 | struct VerifyRequestHandle *vrh; | 874 | struct VerifyRequestHandle *vrh; |
875 | struct GNUNET_SERVICE_Client *client = cls; | 875 | struct GNUNET_SERVICE_Client *client = cls; |
@@ -886,7 +886,9 @@ handle_verify (void *cls, | |||
886 | "Received VERIFY message\n"); | 886 | "Received VERIFY message\n"); |
887 | utf_in = (const char *) &v_msg[1]; | 887 | utf_in = (const char *) &v_msg[1]; |
888 | GNUNET_STRINGS_utf8_tolower (utf_in, attrptr); | 888 | GNUNET_STRINGS_utf8_tolower (utf_in, attrptr); |
889 | GNUNET_memcpy (issuer_attribute, attr, ntohs (v_msg->issuer_attribute_len)); | 889 | GNUNET_memcpy (issuer_attribute, |
890 | attr, | ||
891 | ntohs (v_msg->issuer_attribute_len)); | ||
890 | issuer_attribute[ntohs (v_msg->issuer_attribute_len)] = '\0'; | 892 | issuer_attribute[ntohs (v_msg->issuer_attribute_len)] = '\0'; |
891 | vrh = GNUNET_new (struct VerifyRequestHandle); | 893 | vrh = GNUNET_new (struct VerifyRequestHandle); |
892 | GNUNET_CONTAINER_DLL_insert (vrh_head, vrh_tail, vrh); | 894 | GNUNET_CONTAINER_DLL_insert (vrh_head, vrh_tail, vrh); |
@@ -897,7 +899,7 @@ handle_verify (void *cls, | |||
897 | vrh->issuer_attribute = GNUNET_strdup (issuer_attribute); | 899 | vrh->issuer_attribute = GNUNET_strdup (issuer_attribute); |
898 | if (0 == strlen (issuer_attribute)) | 900 | if (0 == strlen (issuer_attribute)) |
899 | { | 901 | { |
900 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 902 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
901 | "No issuer attribute provided!\n"); | 903 | "No issuer attribute provided!\n"); |
902 | send_lookup_response (vrh); | 904 | send_lookup_response (vrh); |
903 | return; | 905 | return; |
@@ -907,7 +909,7 @@ handle_verify (void *cls, | |||
907 | * TODO: cleanup! | 909 | * TODO: cleanup! |
908 | */ | 910 | */ |
909 | credentials_count = ntohl(v_msg->c_count); | 911 | credentials_count = ntohl(v_msg->c_count); |
910 | credential_data_size = ntohs (v_msg->header.size) | 912 | credential_data_size = ntohs (v_msg->header.size) |
911 | - sizeof (struct VerifyMessage) | 913 | - sizeof (struct VerifyMessage) |
912 | - ntohs (v_msg->issuer_attribute_len) | 914 | - ntohs (v_msg->issuer_attribute_len) |
913 | - 1; | 915 | - 1; |
@@ -918,7 +920,7 @@ handle_verify (void *cls, | |||
918 | credentials_count, | 920 | credentials_count, |
919 | credentials)) | 921 | credentials)) |
920 | { | 922 | { |
921 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 923 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
922 | "Cannot deserialize credentials!\n"); | 924 | "Cannot deserialize credentials!\n"); |
923 | send_lookup_response (vrh); | 925 | send_lookup_response (vrh); |
924 | return; | 926 | return; |
@@ -1015,7 +1017,7 @@ handle_cred_collection_finished_cb (void *cls) | |||
1015 | 1017 | ||
1016 | static void | 1018 | static void |
1017 | handle_collect (void *cls, | 1019 | handle_collect (void *cls, |
1018 | const struct CollectMessage *c_msg) | 1020 | const struct CollectMessage *c_msg) |
1019 | { | 1021 | { |
1020 | char attr[GNUNET_CREDENTIAL_MAX_LENGTH + 1]; | 1022 | char attr[GNUNET_CREDENTIAL_MAX_LENGTH + 1]; |
1021 | char issuer_attribute[GNUNET_CREDENTIAL_MAX_LENGTH + 1]; | 1023 | char issuer_attribute[GNUNET_CREDENTIAL_MAX_LENGTH + 1]; |
@@ -1030,7 +1032,9 @@ handle_collect (void *cls, | |||
1030 | utf_in = (const char *) &c_msg[1]; | 1032 | utf_in = (const char *) &c_msg[1]; |
1031 | GNUNET_STRINGS_utf8_tolower (utf_in, attrptr); | 1033 | GNUNET_STRINGS_utf8_tolower (utf_in, attrptr); |
1032 | 1034 | ||
1033 | GNUNET_memcpy (issuer_attribute, attr, ntohs (c_msg->issuer_attribute_len)); | 1035 | GNUNET_memcpy (issuer_attribute, |
1036 | attr, | ||
1037 | ntohs (c_msg->issuer_attribute_len)); | ||
1034 | issuer_attribute[ntohs (c_msg->issuer_attribute_len)] = '\0'; | 1038 | issuer_attribute[ntohs (c_msg->issuer_attribute_len)] = '\0'; |
1035 | vrh = GNUNET_new (struct VerifyRequestHandle); | 1039 | vrh = GNUNET_new (struct VerifyRequestHandle); |
1036 | GNUNET_CONTAINER_DLL_insert (vrh_head, vrh_tail, vrh); | 1040 | GNUNET_CONTAINER_DLL_insert (vrh_head, vrh_tail, vrh); |
@@ -1043,7 +1047,7 @@ handle_collect (void *cls, | |||
1043 | 1047 | ||
1044 | if (0 == strlen (issuer_attribute)) | 1048 | if (0 == strlen (issuer_attribute)) |
1045 | { | 1049 | { |
1046 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1050 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1047 | "No issuer attribute provided!\n"); | 1051 | "No issuer attribute provided!\n"); |
1048 | send_lookup_response (vrh); | 1052 | send_lookup_response (vrh); |
1049 | return; | 1053 | return; |
diff --git a/src/credential/plugin_gnsrecord_credential.c b/src/credential/plugin_gnsrecord_credential.c index ffb2857dc..cba362a50 100644 --- a/src/credential/plugin_gnsrecord_credential.c +++ b/src/credential/plugin_gnsrecord_credential.c | |||
@@ -62,9 +62,9 @@ credential_value_to_string (void *cls, | |||
62 | int i; | 62 | int i; |
63 | if (data_size < sizeof (struct GNUNET_CREDENTIAL_DelegationRecord)) | 63 | if (data_size < sizeof (struct GNUNET_CREDENTIAL_DelegationRecord)) |
64 | return NULL; /* malformed */ | 64 | return NULL; /* malformed */ |
65 | memcpy (&sets, | 65 | GNUNET_memcpy (&sets, |
66 | data, | 66 | data, |
67 | sizeof (sets)); | 67 | sizeof (sets)); |
68 | cdata = data; | 68 | cdata = data; |
69 | struct GNUNET_CREDENTIAL_DelegationSet set[ntohl(sets.set_count)]; | 69 | struct GNUNET_CREDENTIAL_DelegationSet set[ntohl(sets.set_count)]; |
70 | if (GNUNET_OK != GNUNET_CREDENTIAL_delegation_set_deserialize (GNUNET_ntohll (sets.data_size), | 70 | if (GNUNET_OK != GNUNET_CREDENTIAL_delegation_set_deserialize (GNUNET_ntohll (sets.data_size), |
@@ -224,7 +224,7 @@ credential_string_to_value (void *cls, | |||
224 | } | 224 | } |
225 | tmp_data_size = GNUNET_CREDENTIAL_delegation_set_get_size (entries, | 225 | tmp_data_size = GNUNET_CREDENTIAL_delegation_set_get_size (entries, |
226 | set); | 226 | set); |
227 | 227 | ||
228 | if (-1 == tmp_data_size) | 228 | if (-1 == tmp_data_size) |
229 | { | 229 | { |
230 | GNUNET_free (tmp_str); | 230 | GNUNET_free (tmp_str); |
@@ -248,7 +248,7 @@ credential_string_to_value (void *cls, | |||
248 | return GNUNET_OK; | 248 | return GNUNET_OK; |
249 | } | 249 | } |
250 | case GNUNET_GNSRECORD_TYPE_CREDENTIAL: | 250 | case GNUNET_GNSRECORD_TYPE_CREDENTIAL: |
251 | { | 251 | { |
252 | struct GNUNET_CREDENTIAL_Credential *cred; | 252 | struct GNUNET_CREDENTIAL_Credential *cred; |
253 | cred = GNUNET_CREDENTIAL_credential_from_string (s); | 253 | cred = GNUNET_CREDENTIAL_credential_from_string (s); |
254 | 254 | ||
diff --git a/src/credential/plugin_rest_credential.c b/src/credential/plugin_rest_credential.c index 2e43139de..7f39b34ea 100644 --- a/src/credential/plugin_rest_credential.c +++ b/src/credential/plugin_rest_credential.c | |||
@@ -309,14 +309,14 @@ json_to_credential (json_t *res) | |||
309 | sig, | 309 | sig, |
310 | sizeof (struct GNUNET_CRYPTO_EcdsaSignature)); | 310 | sizeof (struct GNUNET_CRYPTO_EcdsaSignature)); |
311 | GNUNET_free (sig); | 311 | GNUNET_free (sig); |
312 | 312 | ||
313 | tmp = json_object_get (res, "expiration"); | 313 | tmp = json_object_get (res, "expiration"); |
314 | if (0 == json_is_integer (tmp)) | 314 | if (0 == json_is_integer (tmp)) |
315 | { | 315 | { |
316 | GNUNET_free (cred); | 316 | GNUNET_free (cred); |
317 | return NULL; | 317 | return NULL; |
318 | } | 318 | } |
319 | cred->expiration.abs_value_us = json_integer_value (tmp); | 319 | cred->expiration.abs_value_us = json_integer_value (tmp); |
320 | return cred; | 320 | return cred; |
321 | } | 321 | } |
322 | 322 | ||
@@ -342,7 +342,7 @@ credential_to_json (struct GNUNET_CREDENTIAL_Credential *cred) | |||
342 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 342 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
343 | "Issuer in credential malformed\n"); | 343 | "Issuer in credential malformed\n"); |
344 | return NULL; | 344 | return NULL; |
345 | } | 345 | } |
346 | subject = GNUNET_CRYPTO_ecdsa_public_key_to_string (&cred->subject_key); | 346 | subject = GNUNET_CRYPTO_ecdsa_public_key_to_string (&cred->subject_key); |
347 | if (NULL == subject) | 347 | if (NULL == subject) |
348 | { | 348 | { |
@@ -354,9 +354,9 @@ credential_to_json (struct GNUNET_CREDENTIAL_Credential *cred) | |||
354 | GNUNET_STRINGS_base64_encode ((char*)&cred->signature, | 354 | GNUNET_STRINGS_base64_encode ((char*)&cred->signature, |
355 | sizeof (struct GNUNET_CRYPTO_EcdsaSignature), | 355 | sizeof (struct GNUNET_CRYPTO_EcdsaSignature), |
356 | &signature); | 356 | &signature); |
357 | memcpy (attribute, | 357 | GNUNET_memcpy (attribute, |
358 | cred->issuer_attribute, | 358 | cred->issuer_attribute, |
359 | cred->issuer_attribute_len); | 359 | cred->issuer_attribute_len); |
360 | attribute[cred->issuer_attribute_len] = '\0'; | 360 | attribute[cred->issuer_attribute_len] = '\0'; |
361 | cred_obj = json_object (); | 361 | cred_obj = json_object (); |
362 | json_object_set_new (cred_obj, "issuer", json_string (issuer)); | 362 | json_object_set_new (cred_obj, "issuer", json_string (issuer)); |
@@ -570,7 +570,7 @@ collect_cred_cont (struct GNUNET_REST_RequestHandle *conndata_handle, | |||
570 | { | 570 | { |
571 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 571 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
572 | "Missing issuer attribute\n"); | 572 | "Missing issuer attribute\n"); |
573 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 573 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
574 | return; | 574 | return; |
575 | } | 575 | } |
576 | tmp = GNUNET_CONTAINER_multihashmap_get (conndata_handle->url_param_map, | 576 | tmp = GNUNET_CONTAINER_multihashmap_get (conndata_handle->url_param_map, |
@@ -585,7 +585,7 @@ collect_cred_cont (struct GNUNET_REST_RequestHandle *conndata_handle, | |||
585 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 585 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
586 | return; | 586 | return; |
587 | } | 587 | } |
588 | if (GNUNET_OK != | 588 | if (GNUNET_OK != |
589 | GNUNET_CRYPTO_ecdsa_public_key_from_string (tmp, | 589 | GNUNET_CRYPTO_ecdsa_public_key_from_string (tmp, |
590 | strlen (tmp), | 590 | strlen (tmp), |
591 | &handle->issuer_key)) | 591 | &handle->issuer_key)) |
@@ -626,7 +626,7 @@ collect_cred_cont (struct GNUNET_REST_RequestHandle *conndata_handle, | |||
626 | { | 626 | { |
627 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 627 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
628 | "Malformed subject\n"); | 628 | "Malformed subject\n"); |
629 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 629 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
630 | return; | 630 | return; |
631 | } | 631 | } |
632 | handle->ego_lookup = GNUNET_IDENTITY_ego_lookup (cfg, | 632 | handle->ego_lookup = GNUNET_IDENTITY_ego_lookup (cfg, |
@@ -679,7 +679,7 @@ verify_cred_cont (struct GNUNET_REST_RequestHandle *conndata_handle, | |||
679 | { | 679 | { |
680 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 680 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
681 | "Missing issuer attribute\n"); | 681 | "Missing issuer attribute\n"); |
682 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 682 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
683 | return; | 683 | return; |
684 | } | 684 | } |
685 | tmp = GNUNET_CONTAINER_multihashmap_get (conndata_handle->url_param_map, | 685 | tmp = GNUNET_CONTAINER_multihashmap_get (conndata_handle->url_param_map, |
@@ -694,7 +694,7 @@ verify_cred_cont (struct GNUNET_REST_RequestHandle *conndata_handle, | |||
694 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 694 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
695 | return; | 695 | return; |
696 | } | 696 | } |
697 | if (GNUNET_OK != | 697 | if (GNUNET_OK != |
698 | GNUNET_CRYPTO_ecdsa_public_key_from_string (tmp, | 698 | GNUNET_CRYPTO_ecdsa_public_key_from_string (tmp, |
699 | strlen (tmp), | 699 | strlen (tmp), |
700 | &handle->issuer_key)) | 700 | &handle->issuer_key)) |
@@ -735,7 +735,7 @@ verify_cred_cont (struct GNUNET_REST_RequestHandle *conndata_handle, | |||
735 | { | 735 | { |
736 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 736 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
737 | "Malformed subject\n"); | 737 | "Malformed subject\n"); |
738 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 738 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
739 | return; | 739 | return; |
740 | } | 740 | } |
741 | if (GNUNET_OK != | 741 | if (GNUNET_OK != |
@@ -946,7 +946,7 @@ get_cred_issuer_cb (void *cls, | |||
946 | { | 946 | { |
947 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 947 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
948 | "Missing expiration\n"); | 948 | "Missing expiration\n"); |
949 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 949 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
950 | return; | 950 | return; |
951 | } | 951 | } |
952 | expiration_str = GNUNET_CONTAINER_multihashmap_get (handle->rest_handle->url_param_map, | 952 | expiration_str = GNUNET_CONTAINER_multihashmap_get (handle->rest_handle->url_param_map, |
@@ -955,7 +955,7 @@ get_cred_issuer_cb (void *cls, | |||
955 | { | 955 | { |
956 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 956 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
957 | "Expiration malformed\n"); | 957 | "Expiration malformed\n"); |
958 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 958 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
959 | return; | 959 | return; |
960 | } | 960 | } |
961 | 961 | ||
@@ -968,7 +968,7 @@ get_cred_issuer_cb (void *cls, | |||
968 | { | 968 | { |
969 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 969 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
970 | "Malformed expiration: %s\n", expiration_str); | 970 | "Malformed expiration: %s\n", expiration_str); |
971 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 971 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
972 | return; | 972 | return; |
973 | } | 973 | } |
974 | GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_CREDENTIAL_ISSUER_ATTR, | 974 | GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_CREDENTIAL_ISSUER_ATTR, |
@@ -980,10 +980,10 @@ get_cred_issuer_cb (void *cls, | |||
980 | { | 980 | { |
981 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 981 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
982 | "Missing issuer attribute\n"); | 982 | "Missing issuer attribute\n"); |
983 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 983 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
984 | return; | 984 | return; |
985 | } | 985 | } |
986 | handle->issuer_attr = GNUNET_strdup(GNUNET_CONTAINER_multihashmap_get | 986 | handle->issuer_attr = GNUNET_strdup(GNUNET_CONTAINER_multihashmap_get |
987 | (handle->rest_handle->url_param_map, | 987 | (handle->rest_handle->url_param_map, |
988 | &key)); | 988 | &key)); |
989 | GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_CREDENTIAL_SUBJECT_KEY, | 989 | GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_CREDENTIAL_SUBJECT_KEY, |
@@ -1004,7 +1004,7 @@ get_cred_issuer_cb (void *cls, | |||
1004 | { | 1004 | { |
1005 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1005 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1006 | "Malformed subject\n"); | 1006 | "Malformed subject\n"); |
1007 | GNUNET_SCHEDULER_add_now (&do_error, handle); | 1007 | GNUNET_SCHEDULER_add_now (&do_error, handle); |
1008 | return; | 1008 | return; |
1009 | } | 1009 | } |
1010 | if (GNUNET_OK != | 1010 | if (GNUNET_OK != |