- remove purpose from cred

1 files changed, 15 insertions, 6 deletions

diff --git a/src/credential/credential_api.c b/src/credential/credential_api.c
index b6c585c72..3be2d8bbb 100644
--- a/src/credential/credential_api.c
+++ b/src/credential/credential_api.c
@@ -428,23 +428,32 @@ GNUNET_CREDENTIAL_issue (struct GNUNET_CREDENTIAL_Handle *handle,
                          const char *attribute)
 {
   struct GNUNET_CREDENTIAL_CredentialRecordData *crd;
+  struct GNUNET_CRYPTO_EccSignaturePurpose *purp;
 
   crd = GNUNET_malloc (sizeof (struct GNUNET_CREDENTIAL_CredentialRecordData) + strlen (attribute) + 1);
 
-  crd->purpose.size = htonl (strlen (attribute) + 1 +
-                             sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
-                                               sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
-                                               sizeof (struct GNUNET_TIME_AbsoluteNBO));
-  crd->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CREDENTIAL);
+  purp = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
+                        strlen (attribute) + 1);
+  purp->size = htonl (strlen (attribute) + 1 +
+                      sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
+                                        sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose));
+  
+  purp->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CREDENTIAL);
   GNUNET_CRYPTO_ecdsa_key_get_public (issuer,
                                       &crd->issuer_key);
   crd->subject_key = *subject;
   GNUNET_memcpy (&crd[1],
                  attribute,
                  strlen (attribute));
+  GNUNET_memcpy (&purp[1],
+                 subject,
+                 sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey));
+  GNUNET_memcpy (&purp[1] + sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
+                 attribute,
+                 strlen (attribute));
   if (GNUNET_OK !=
       GNUNET_CRYPTO_ecdsa_sign (issuer,
-                                &crd->purpose,
+                                purp,
                                 &crd->sig))
   {
     GNUNET_break (0);