Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials

2 files changed, 35 insertions, 4 deletions

diff --git a/src/credential/gnunet-service-credential.c b/src/credential/gnunet-service-credential.c
index 620256cd9..ed7d249e3 100644
--- a/src/credential/gnunet-service-credential.c
+++ b/src/credential/gnunet-service-credential.c
@@ -312,6 +312,17 @@ send_lookup_response (void* cls,
 
 
   /**
+   * TODO
+   * Start resolution of Attribute delegations from issuer
+   *
+   * - Build adequate data structures for attribute(s) to lookup
+   * - Use GNUNET_GNSRECORD_TYPE_XXX
+   * - recursively try to find match(es) with results found top
+   * - return one found credential chain
+   *
+   */
+
+  /**
    * Get serialized record data size
    */
   len = cred_record_count * sizeof (struct GNUNET_CREDENTIAL_CredentialRecordData);
diff --git a/src/credential/plugin_gnsrecord_credential.c b/src/credential/plugin_gnsrecord_credential.c
index cc645468d..d321a43a4 100644
--- a/src/credential/plugin_gnsrecord_credential.c
+++ b/src/credential/plugin_gnsrecord_credential.c
@@ -51,14 +51,34 @@ credential_value_to_string (void *cls,
 
   switch (type)
   {
+   case GNUNET_GNSRECORD_TYPE_ATTRIBUTE:
+   {
+    struct GNUNET_CREDENTIAL_AttributeRecordData attr;
+    char *attr_str;
+    char *subject_pkey;
+    
+    if (data_size < sizeof (struct GNUNET_CREDENTIAL_AttributeRecordData))
+      return NULL; /* malformed */
+    memcpy (&attr,
+            data,
+            sizeof (attr));
+    cdata = data;
+    subject_pkey = GNUNET_CRYPTO_ecdsa_public_key_to_string (&attr.subject_key);
+    GNUNET_asprintf (&attr_str,
+                     "%s.%s",
+                     subject_pkey,
+                     &cdata[sizeof (attr)]);
+    GNUNET_free (subject_pkey);
+    return attr_str;
+   }
    case GNUNET_GNSRECORD_TYPE_CREDENTIAL:
    {
-    struct GNUNET_CREDENTIAL_AttributeRecordData cred;
+    struct GNUNET_CREDENTIAL_CredentialRecordData cred;
     char *cred_str;
     char *subject_pkey;
     char *issuer_pkey;
     uint32_t cf; // Credential flags
-    if (data_size < sizeof (struct GNUNET_CREDENTIAL_AttributeRecordData))
+    if (data_size < sizeof (struct GNUNET_CREDENTIAL_CredentialRecordData))
         return NULL; /* malformed */
     memcpy (&cred,
               data,
@@ -111,7 +131,7 @@ credential_string_to_value (void *cls,
   {
     case GNUNET_GNSRECORD_TYPE_CREDENTIAL:
       { 
-        struct GNUNET_CREDENTIAL_AttributeRecordData *cred;
+        struct GNUNET_CREDENTIAL_CredentialRecordData *cred;
         unsigned int cf; // credential flags
 
         size_t enclen = (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)) * 8;
@@ -134,7 +154,7 @@ credential_string_to_value (void *cls,
                       s);
           return GNUNET_SYSERR;
         }
-        *data_size = sizeof (struct GNUNET_CREDENTIAL_AttributeRecordData) + strlen (name) + 1;
+        *data_size = sizeof (struct GNUNET_CREDENTIAL_CredentialRecordData) + strlen (name) + 1;
         *data = cred = GNUNET_malloc (*data_size);
         GNUNET_CRYPTO_ecdsa_public_key_from_string (subject_pkey,
                                                     strlen (subject_pkey),