Merge remote-tracking branch 'origin/master' into identity_abe

[oweals/gnunet.git] / src / credential / gnunet-service-credential.c

diff --git a/src/credential/gnunet-service-credential.c b/src/credential/gnunet-service-credential.c
index 75ed6d5da5c0ef02e2001b3d495045343ea3528f..be75e485ec375f65b2e573615e93fe7f1f9ad95c 100644 (file)
--- a/src/credential/gnunet-service-credential.c
+++ b/src/credential/gnunet-service-credential.c
@@ -772,7 +772,6 @@ backward_resolution (void* cls,
                                                     ds_entry->issuer_key, //issuer_key,
                                                     GNUNET_GNSRECORD_TYPE_ATTRIBUTE,
                                                     GNUNET_GNS_LO_DEFAULT,
-                                                    NULL, //shorten_key, always NULL
                                                     &backward_resolution,
                                                     ds_entry);
       GNUNET_free (lookup_attribute);
@@ -855,7 +854,6 @@ delegation_chain_resolution_start (void* cls)
                                                 &vrh->issuer_key, //issuer_key,
                                                 GNUNET_GNSRECORD_TYPE_ATTRIBUTE,
                                                 GNUNET_GNS_LO_DEFAULT,
-                                                NULL, //shorten_key, always NULL
                                                 &backward_resolution,
                                                 ds_entry);
 }
@@ -963,13 +961,13 @@ handle_verify (void *cls,
   for (i=0;i<credentials_count;i++) {
     cr_entry = GNUNET_new (struct CredentialRecordEntry);
     cr_entry->credential = GNUNET_malloc (sizeof (struct GNUNET_CREDENTIAL_Credential) +
-                                          strlen (credentials[i].issuer_attribute) + 1);
+                                          credentials[i].issuer_attribute_len);
     GNUNET_memcpy (cr_entry->credential,
                    &credentials[i],
                    sizeof (struct GNUNET_CREDENTIAL_Credential));
     GNUNET_memcpy (&cr_entry->credential[1],
                    credentials[i].issuer_attribute,
-                   strlen (credentials[i].issuer_attribute));
+                   credentials[i].issuer_attribute_len);
     cr_entry->credential->issuer_attribute = (char*)&cr_entry->credential[1];
     GNUNET_CONTAINER_DLL_insert_tail (vrh->cred_chain_head,
                                       vrh->cred_chain_tail,