- merge; service API change

[oweals/gnunet.git] / src / identity-provider / identity_provider_api.c

diff --git a/src/identity-provider/identity_provider_api.c b/src/identity-provider/identity_provider_api.c
index 32c3cb7033bdcbea6fa155d6d19e562ea5fe7588..21ec235b630aab59df7c00f206e5a3385827a3b4 100644 (file)
--- a/src/identity-provider/identity_provider_api.c
+++ b/src/identity-provider/identity_provider_api.c
@@ -223,12 +223,12 @@ check_exchange_result (void *cls,
               const struct ExchangeResultMessage *erm)
 {
   char *str;
-  size_t size = ntohs (erm->header.size) - sizeof (*erm);
+  size_t size = ntohs (erm->header.size);
   
 
-  str = (char *) &erm[1];
+  str = (char *) &erm[0];
   if ( (size > sizeof (struct ExchangeResultMessage)) &&
-       ('\0' != str[size - sizeof (struct ExchangeResultMessage) - 1]) )
+       ('\0' != str[size - 1]) )
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
@@ -248,10 +248,10 @@ check_result (void *cls,
               const struct IssueResultMessage *irm)
 {
   char *str;
-  size_t size = ntohs (irm->header.size) - sizeof (*irm);
-  str = (char*) &irm[1];
+  size_t size = ntohs (irm->header.size);
+  str = (char*) &irm[0];
   if ( (size > sizeof (struct IssueResultMessage)) &&
-       ('\0' != str[size - sizeof (struct IssueResultMessage) - 1]) )
+       ('\0' != str[size - 1]) )
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
@@ -430,6 +430,7 @@ GNUNET_IDENTITY_PROVIDER_issue_token (struct GNUNET_IDENTITY_PROVIDER_Handle *id
                                       const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss_key,
                                       const struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key,
                                       const char* scopes,
+                                      const char* vattr,
                                       struct GNUNET_TIME_Absolute expiration,
                                       uint64_t nonce,
                                       GNUNET_IDENTITY_PROVIDER_IssueCallback cb,
@@ -440,6 +441,8 @@ GNUNET_IDENTITY_PROVIDER_issue_token (struct GNUNET_IDENTITY_PROVIDER_Handle *id
   size_t slen;
 
   slen = strlen (scopes) + 1;
+  if (NULL != vattr)
+    slen += strlen (vattr) + 1;
   if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct IssueMessage))
   {
     GNUNET_break (0);
@@ -456,9 +459,12 @@ GNUNET_IDENTITY_PROVIDER_issue_token (struct GNUNET_IDENTITY_PROVIDER_Handle *id
   im->id = op->r_id;
   im->iss_key = *iss_key;
   im->aud_key = *aud_key;
+  im->scope_len = htonl (strlen(scopes)+1);
   im->nonce = htonl (nonce);
   im->expiration = GNUNET_TIME_absolute_hton (expiration);
-  GNUNET_memcpy (&im[1], scopes, slen);
+  GNUNET_memcpy (&im[1], scopes, strlen(scopes));
+  if (NULL != vattr)
+    GNUNET_memcpy ((char*)&im[1]+strlen(scopes)+1, vattr, strlen(vattr));
   GNUNET_CONTAINER_DLL_insert_tail (id->op_head,
                                     id->op_tail,
                                     op);