-w3cvc extend reclaim plugin api header

7 files changed, 18 insertions, 0 deletions

diff --git a/src/include/gnunet_reclaim_lib.h b/src/include/gnunet_reclaim_lib.h
index ae3e7cd14..33e42fd09 100644
--- a/src/include/gnunet_reclaim_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
@@ -38,6 +38,7 @@ extern "C" {
 #endif
 
 #include "gnunet_util_lib.h"
+#include "gnunet_identity_service.h"
 
 enum GNUNET_RECLAIM_AttributeType {
   /**
@@ -847,6 +848,7 @@ int
 GNUNET_RECLAIM_credential_get_presentation (
                               const struct GNUNET_RECLAIM_Credential *cred,
                               const struct GNUNET_RECLAIM_AttributeList *attrs,
+                              const struct GNUNET_IDENTITY_Ego *ego,
                               struct GNUNET_RECLAIM_Presentation **presentation);
 
 
diff --git a/src/include/gnunet_reclaim_plugin.h b/src/include/gnunet_reclaim_plugin.h
index 11d5d76f7..163995adb 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -32,6 +32,7 @@
 
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_lib.h"
+#include "gnunet_identity_service.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -305,6 +306,7 @@ typedef int (*GNUNET_RECLAIM_CredentialToPresentation) (
   void *cls,
   const struct GNUNET_RECLAIM_Credential *cred,
   const struct GNUNET_RECLAIM_AttributeList *attrs,
+  const struct GNUNET_IDENTITY_Ego *ego,
   struct GNUNET_RECLAIM_Presentation **presentation);
 
 /**
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index 8c6555abb..1b8a92b38 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -177,6 +177,7 @@ libgnunet_plugin_reclaim_credential_vc_la_SOURCES = \
   plugin_reclaim_credential_vc.c
 libgnunet_plugin_reclaim_credential_vc_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetreclaim.la \
   -ljansson\
   $(LTLIBINTL)
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c
index 0dd87aee9..e9e3c3dd1 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/reclaim/gnunet-service-reclaim_tickets.c
@@ -1527,6 +1527,7 @@ filter_tickets_cb (void *cls,
         if (GNUNET_OK != GNUNET_RECLAIM_credential_get_presentation (
               cred,
               tih->attrs,
+              NULL,
               &presentation))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/reclaim/plugin_reclaim_credential_jwt.c b/src/reclaim/plugin_reclaim_credential_jwt.c
index 5d5e221f9..bab8125ad 100644
--- a/src/reclaim/plugin_reclaim_credential_jwt.c
+++ b/src/reclaim/plugin_reclaim_credential_jwt.c
@@ -28,6 +28,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_plugin.h"
+#include "gnunet_identity_service.h"
 #include <inttypes.h>
 #include <jansson.h>
 
@@ -437,6 +438,7 @@ enum GNUNET_GenericReturnValue
 jwt_create_presentation (void *cls,
                          const struct GNUNET_RECLAIM_Credential *cred,
                          const struct GNUNET_RECLAIM_AttributeList *attrs,
+                         const struct GNUNET_IDENTITY_Ego *ego,
                          struct GNUNET_RECLAIM_Presentation **presentation)
 {
   if (GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT != cred->type)
diff --git a/src/reclaim/plugin_reclaim_credential_vc.c b/src/reclaim/plugin_reclaim_credential_vc.c
index db30a3745..735e33e78 100644
--- a/src/reclaim/plugin_reclaim_credential_vc.c
+++ b/src/reclaim/plugin_reclaim_credential_vc.c
@@ -28,6 +28,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_plugin.h"
+#include "gnunet_identity_service.h"
 #include <inttypes.h>
 #include <jansson.h>
 
@@ -451,6 +452,7 @@ enum GNUNET_GenericReturnValue
 vc_create_presentation (void *cls,
                          const struct GNUNET_RECLAIM_Credential *cred,
                          const struct GNUNET_RECLAIM_AttributeList *attrs,
+                         const struct GNUNET_IDENTITY_Ego *ego,
                          struct GNUNET_RECLAIM_Presentation **presentation)
 {
   // Check if Ego has a DID Docuement
@@ -461,6 +463,11 @@ vc_create_presentation (void *cls,
   json_t * credential;
   json_t * proof;
 
+  struct GNUNET_IDENTITY_PublicKey pkey;
+  GNUNET_IDENTITY_ego_get_public_key(ego, &pkey);
+  
+  printf("DEBUG - %s\n", GNUNET_IDENTITY_public_key_to_string(&pkey));
+
   char * json_str;
   char * presentation_str;
   const char * now;
diff --git a/src/reclaim/reclaim_credential.c b/src/reclaim/reclaim_credential.c
index b4aeedf29..6d4707fb1 100644
--- a/src/reclaim/reclaim_credential.c
+++ b/src/reclaim/reclaim_credential.c
@@ -1036,6 +1036,7 @@ GNUNET_RECLAIM_presentation_get_expiration (const struct
  *
  * @param cred the credential to use
  * @param attrs the attributes to present from the credential
+ * @param ego the ego (subject) who creates the presentation
  * @return the credential presentation presenting the attributes according
  *         to the presentation mechanism of the credential
  *         or NULL on error.
@@ -1044,6 +1045,7 @@ int
 GNUNET_RECLAIM_credential_get_presentation (
   const struct GNUNET_RECLAIM_Credential *cred,
   const struct GNUNET_RECLAIM_AttributeList *attrs,
+  const struct GNUNET_IDENTITY_Ego *ego,
   struct GNUNET_RECLAIM_Presentation **presentation)
 {
   unsigned int i;
@@ -1055,6 +1057,7 @@ GNUNET_RECLAIM_credential_get_presentation (
     if (GNUNET_OK !=  plugin->api->create_presentation (plugin->api->cls,
                                                         cred,
                                                         attrs,
+                                                        ego,
                                                         presentation))
       continue;
     (*presentation)->credential_id = cred->id;