-w3cvc hello world

6 files changed, 108 insertions, 66 deletions

diff --git a/src/did/test_w3c_ed25519_2020.c b/src/did/test_w3c_ed25519_2020.c
index e2534e6ab..9e62062b1 100644
--- a/src/did/test_w3c_ed25519_2020.c
+++ b/src/did/test_w3c_ed25519_2020.c
@@ -1,5 +1,3 @@
-/*
-   This file is part of GNUnet.
    Copyright (C) 2012-2021 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
@@ -21,7 +19,7 @@
 
 /**
  * @file src/did/test_w3c_ed25519_2020.c
- * @brief Testcases for the w3c Ed25519 formats for SSIs https://w3c-ccg.github.io/lds-ed25519-2020
+ * @brief Testcases for the w3c Ed25519 formats for SSIs https://w3c-ccwg.github.io/lds-ed25519-2020
  * @author Martin Schanzenbach
  */
 
diff --git a/src/include/gnunet_reclaim_lib.h b/src/include/gnunet_reclaim_lib.h
index 8e0e19f01..ae3e7cd14 100644
--- a/src/include/gnunet_reclaim_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
@@ -70,7 +70,7 @@ enum GNUNET_RECLAIM_CredentialType {
   /**
    * verifiable credential
    */
-  GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE = 3
+  GNUNET_RECLAIM_CREDENTIAL_TYPE_VC = 3
 };
 
 /**
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index 911a95134..8c6555abb 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -15,7 +15,7 @@ REST_PLUGIN = \
 
 CREDENTIAL_PLUGIN = \
   libgnunet_plugin_reclaim_credential_jwt.la \
-  libgnunet_plugin_reclaim_w3c_verifiable_credential.la
+  libgnunet_plugin_reclaim_credential_vc.la
 
 if HAVE_PABC
   CREDENTIAL_PLUGIN += libgnunet_plugin_reclaim_credential_pabc.la
@@ -173,14 +173,14 @@ libgnunet_plugin_reclaim_credential_jwt_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 
-libgnunet_plugin_reclaim_w3c_verifiable_credential_la_SOURCES = \
-  plugin_reclaim_w3c_verifiable_credential.c
-libgnunet_plugin_reclaim_w3c_verifiable_credential_la_LIBADD = \
+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 \
   libgnunetreclaim.la \
   -ljansson\
   $(LTLIBINTL)
-libgnunet_plugin_reclaim_w3c_verifiable_credential_la_LDFLAGS = \
+libgnunet_plugin_reclaim_credential_vc_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 
diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c
index da5f90409..5339e047b 100644
--- a/src/reclaim/gnunet-reclaim.c
+++ b/src/reclaim/gnunet-reclaim.c
@@ -621,6 +621,14 @@ cred_iter_finished (void *cls)
   {
     enum GNUNET_RECLAIM_CredentialType ctype =
       GNUNET_RECLAIM_credential_typename_to_number (credential_type);
+
+    if (ctype == UINT32_MAX)
+    {
+      printf("Unknown Credential Type");
+      cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
+      return;
+    }
+
     struct GNUNET_RECLAIM_Credential *credential =
       GNUNET_RECLAIM_credential_new (credential_name,
                                      ctype,
@@ -672,6 +680,14 @@ cred_iter_cb (void *cls,
                                                           cred->data,
                                                           cred->data_size);
     cred_type = GNUNET_RECLAIM_credential_number_to_typename (cred->type);
+
+    if (cred->type == UINT32_MAX)
+    {
+      printf("Unknown Credential Type");
+      cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
+      return;
+    }
+
     id = GNUNET_STRINGS_data_to_string_alloc (&cred->id, sizeof(cred->id));
     fprintf (stdout,
              "%s: ``%s'' (%s); ID: %s\n",
diff --git a/src/reclaim/plugin_reclaim_w3c_verifiable_credential.c b/src/reclaim/plugin_reclaim_credential_vc.c
index 7902b2084..d05601263 100644
--- a/src/reclaim/plugin_reclaim_w3c_verifiable_credential.c
+++ b/src/reclaim/plugin_reclaim_credential_vc.c
@@ -41,14 +41,15 @@
    * @return NULL on error, otherwise human-readable representation of the value
    */
 static char *
-w3cvc_value_to_string (void *cls,
+vc_value_to_string (void *cls,
                      uint32_t type,
                      const void *data,
                      size_t data_size)
 {
   switch (type)
   {
-  case GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE:
+  case GNUNET_RECLAIM_CREDENTIAL_TYPE_VC:
+    printf("DEBUG: vc_value_to_string: %s\n", (char *) data);
     return GNUNET_strndup (data, data_size);
     //return "A super cool verifiable credential\n";
   default:
@@ -69,7 +70,7 @@ w3cvc_value_to_string (void *cls,
  * @return #GNUNET_OK on success
  */
 static int
-w3cvc_string_to_value (void *cls,
+vc_string_to_value (void *cls,
                      uint32_t type,
                      const char *s,
                      void **data,
@@ -80,7 +81,8 @@ w3cvc_string_to_value (void *cls,
 
   switch (type)
   {
-  case GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE:
+  case GNUNET_RECLAIM_CREDENTIAL_TYPE_VC:
+    printf("DEBUG: vc_string_to_value: %s\n", s);
     *data = GNUNET_strdup (s);
     *data_size = strlen (s) + 1;
     return GNUNET_OK;
@@ -99,26 +101,26 @@ static struct
 {
   const char *name;
   uint32_t number;
-} w3cvc_cred_name_map[] = { { "W3CVC", GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE},
+} vc_cred_name_map[] = { { "VC", GNUNET_RECLAIM_CREDENTIAL_TYPE_VC},
                           { NULL, UINT32_MAX } };
 
 /**
    * Convert a type name to the corresponding number.
    *
    * @param cls closure, unused
-   * @param w3cvc_typename name to convert
+   * @param vc_typename name to convert
    * @return corresponding number, UINT32_MAX on error
    */
 static uint32_t
-w3cvc_typename_to_number (void *cls, const char *w3cvc_typename)
+vc_typename_to_number (void *cls, const char *vc_typename)
 {
   unsigned int i;
 
   i = 0;
-  while ((NULL != w3cvc_cred_name_map[i].name) &&
-         (0 != strcasecmp (w3cvc_typename, w3cvc_cred_name_map[i].name)))
+  while ((NULL != vc_cred_name_map[i].name) &&
+         (0 != strcasecmp (vc_typename, vc_cred_name_map[i].name)))
     i++;
-  return w3cvc_cred_name_map[i].number;
+  return vc_cred_name_map[i].number;
 }
 
 
@@ -130,16 +132,16 @@ w3cvc_typename_to_number (void *cls, const char *w3cvc_typename)
  * @return corresponding typestring, NULL on error
  */
 static const char *
-w3cvc_number_to_typename (void *cls, uint32_t type)
+vc_number_to_typename (void *cls, uint32_t type)
 {
   unsigned int i;
 
   i = 0;
-  while ((NULL != w3cvc_cred_name_map[i].name) && (type !=
-                                                 w3cvc_cred_name_map[i].
+  while ((NULL != vc_cred_name_map[i].name) && (type !=
+                                                 vc_cred_name_map[i].
                                                  number))
     i++;
-  return w3cvc_cred_name_map[i].name;
+  return vc_cred_name_map[i].name;
 }
 
 
@@ -151,18 +153,20 @@ w3cvc_number_to_typename (void *cls, uint32_t type)
  * @return a GNUNET_RECLAIM_Attribute, containing the new value
  */
 struct GNUNET_RECLAIM_AttributeList *
-w3cvc_parse_attributes (void *cls,
+vc_parse_attributes (void *cls,
                       const char *data,
                       size_t data_size)
 {
   struct GNUNET_RECLAIM_AttributeList *attrs = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
 
+  printf("DEBUG: vc_parse_attributes: %s\n", data);
+
   GNUNET_RECLAIM_attribute_list_add (attrs,
                                      "astring",
                                      NULL,
                                      GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING,
                                      data,
-                                     strlen(data));
+                                     (strlen(data) + 1));
 
   return attrs;
 }
@@ -176,12 +180,12 @@ w3cvc_parse_attributes (void *cls,
  * @return a GNUNET_RECLAIM_Attribute, containing the new value
  */
 struct GNUNET_RECLAIM_AttributeList *
-w3cvc_parse_attributes_c (void *cls,
+vc_parse_attributes_c (void *cls,
                         const struct GNUNET_RECLAIM_Credential *cred)
 {
-  if (cred->type != GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE)
+  if (cred->type != GNUNET_RECLAIM_CREDENTIAL_TYPE_VC)
     return NULL;
-  return w3cvc_parse_attributes (cls, cred->data, cred->data_size);
+  return vc_parse_attributes (cls, cred->data, cred->data_size);
 }
 
 
@@ -193,12 +197,12 @@ w3cvc_parse_attributes_c (void *cls,
  * @return a GNUNET_RECLAIM_Attribute, containing the new value
  */
 struct GNUNET_RECLAIM_AttributeList *
-w3cvc_parse_attributes_p (void *cls,
+vc_parse_attributes_p (void *cls,
                         const struct GNUNET_RECLAIM_Presentation *cred)
 {
-  if (cred->type != GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE)
+  if (cred->type != GNUNET_RECLAIM_CREDENTIAL_TYPE_VC)
     return NULL;
-  return w3cvc_parse_attributes (cls, cred->data, cred->data_size);
+  return vc_parse_attributes (cls, cred->data, cred->data_size);
 }
 
 
@@ -210,11 +214,12 @@ w3cvc_parse_attributes_p (void *cls,
  * @return a string, containing the isser
  */
 char *
-w3cvc_get_issuer (void *cls,
+vc_get_issuer (void *cls,
                 const char *data,
                 size_t data_size)
 {
-  return "some cool boi";
+  char * string = "some cool boi";
+  return GNUNET_strndup(string, strlen(string));
 }
 
 
@@ -226,12 +231,12 @@ w3cvc_get_issuer (void *cls,
  * @return a string, containing the isser
  */
 char *
-w3cvc_get_issuer_c (void *cls,
+vc_get_issuer_c (void *cls,
                   const struct GNUNET_RECLAIM_Credential *cred)
 {
-  if (GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE != cred->type)
+  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_VC != cred->type)
     return NULL;
-  return w3cvc_get_issuer (cls, cred->data, cred->data_size);
+  return vc_get_issuer (cls, cred->data, cred->data_size);
 }
 
 
@@ -243,12 +248,12 @@ w3cvc_get_issuer_c (void *cls,
  * @return a string, containing the isser
  */
 char *
-w3cvc_get_issuer_p (void *cls,
+vc_get_issuer_p (void *cls,
                   const struct GNUNET_RECLAIM_Presentation *cred)
 {
-  if (GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE != cred->type)
+  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_VC != cred->type)
     return NULL;
-  return w3cvc_get_issuer (cls, cred->data, cred->data_size);
+  return vc_get_issuer (cls, cred->data, cred->data_size);
 }
 
 
@@ -260,7 +265,7 @@ w3cvc_get_issuer_p (void *cls,
  * @return a string, containing the expiration
  */
 enum GNUNET_GenericReturnValue
-w3cvc_get_expiration (void *cls,
+vc_get_expiration (void *cls,
                     const char *data,
                     size_t data_size,
                     struct GNUNET_TIME_Absolute *exp)
@@ -278,13 +283,13 @@ w3cvc_get_expiration (void *cls,
  * @return the expirati
  */
 enum GNUNET_GenericReturnValue
-w3cvc_get_expiration_c (void *cls,
+vc_get_expiration_c (void *cls,
                       const struct GNUNET_RECLAIM_Credential *cred,
                       struct GNUNET_TIME_Absolute *exp)
 {
-  if (GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE != cred->type)
+  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_VC != cred->type)
     return GNUNET_NO;
-  return w3cvc_get_expiration (cls, cred->data, cred->data_size, exp);
+  return vc_get_expiration (cls, cred->data, cred->data_size, exp);
 }
 
 
@@ -296,26 +301,26 @@ w3cvc_get_expiration_c (void *cls,
  * @return a string, containing the isser
  */
 enum GNUNET_GenericReturnValue
-w3cvc_get_expiration_p (void *cls,
+vc_get_expiration_p (void *cls,
                       const struct GNUNET_RECLAIM_Presentation *cred,
                       struct GNUNET_TIME_Absolute *exp)
 {
-  if (GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE  != cred->type)
+  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_VC  != cred->type)
     return GNUNET_NO;
-  return w3cvc_get_expiration (cls, cred->data, cred->data_size, exp);
+  return vc_get_expiration (cls, cred->data, cred->data_size, exp);
 }
 
 
 enum GNUNET_GenericReturnValue
-w3cvc_create_presentation (void *cls,
+vc_create_presentation (void *cls,
                          const struct GNUNET_RECLAIM_Credential *cred,
                          const struct GNUNET_RECLAIM_AttributeList *attrs,
                          struct GNUNET_RECLAIM_Presentation **presentation)
 {
-  if (GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE != cred->type)
+  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_VC != cred->type)
     return GNUNET_NO;
   *presentation = GNUNET_RECLAIM_presentation_new (
-    GNUNET_RECLAIM_W3C_VERFIIABLE_CREDENTIAL_TYPE,
+    GNUNET_RECLAIM_CREDENTIAL_TYPE_VC,
     cred->data,
     cred->data_size);
   return GNUNET_OK;
@@ -329,26 +334,26 @@ w3cvc_create_presentation (void *cls,
  * @return the exported block API
  */
 void *
-libgnunet_plugin_reclaim_credential_w3cvc_init (void *cls)
+libgnunet_plugin_reclaim_credential_vc_init (void *cls)
 {
   struct GNUNET_RECLAIM_CredentialPluginFunctions *api;
 
   api = GNUNET_new (struct GNUNET_RECLAIM_CredentialPluginFunctions);
-  api->value_to_string = &w3cvc_value_to_string;
-  api->string_to_value = &w3cvc_string_to_value;
-  api->typename_to_number = &w3cvc_typename_to_number;
-  api->number_to_typename = &w3cvc_number_to_typename;
-  api->get_attributes = &w3cvc_parse_attributes_c;
-  api->get_issuer = &w3cvc_get_issuer_c;
-  api->get_expiration = &w3cvc_get_expiration_c;
-  api->value_to_string_p = &w3cvc_value_to_string;
-  api->string_to_value_p = &w3cvc_string_to_value;
-  api->typename_to_number_p = &w3cvc_typename_to_number;
-  api->number_to_typename_p = &w3cvc_number_to_typename;
-  api->get_attributes_p = &w3cvc_parse_attributes_p;
-  api->get_issuer_p = &w3cvc_get_issuer_p;
-  api->get_expiration_p = &w3cvc_get_expiration_p;
-  api->create_presentation = &w3cvc_create_presentation;
+  api->value_to_string = &vc_value_to_string;
+  api->string_to_value = &vc_string_to_value;
+  api->typename_to_number = &vc_typename_to_number; // done
+  api->number_to_typename = &vc_number_to_typename; // done
+  api->get_attributes = &vc_parse_attributes_c;
+  api->get_issuer = &vc_get_issuer_c;
+  api->get_expiration = &vc_get_expiration_c; // not needed
+  api->value_to_string_p = &vc_value_to_string;
+  api->string_to_value_p = &vc_string_to_value;
+  api->typename_to_number_p = &vc_typename_to_number; // done
+  api->number_to_typename_p = &vc_number_to_typename; // done
+  api->get_attributes_p = &vc_parse_attributes_p;
+  api->get_issuer_p = &vc_get_issuer_p;
+  api->get_expiration_p = &vc_get_expiration_p;
+  api->create_presentation = &vc_create_presentation;
   return api;
 }
 
@@ -360,7 +365,7 @@ libgnunet_plugin_reclaim_credential_w3cvc_init (void *cls)
  * @return NULL
  */
 void *
-libgnunet_plugin_reclaim_credential_w3cvc_done (void *cls)
+libgnunet_plugin_reclaim_credential_vc_done (void *cls)
 {
   struct GNUNET_RECLAIM_CredentialPluginFunctions *api = cls;
 
diff --git a/vc.json b/vc.json
new file mode 100644
index 000000000..dbc4d5d6d
--- /dev/null
+++ b/vc.json
@@ -0,0 +1,23 @@
+{
+  "@context": [
+    "https://www.w3.org/2018/credentials/v1",
+    "https://www.w3.org/2018/credentials/examples/v1"
+  ],
+  "type": ["VerifiableCredential"],
+  "issuer": "did:reclaim:1234",
+  "issuanceDate": "2018-02-24T05:28:04Z",
+  "credentialSubject": {
+    "id": "did:example:abcdef1234567",
+    "name": "Jane Doe"
+  },
+  "proof": {
+    "type": "RsaSignature2018",
+    "created": "2017-06-18T21:19:10Z",
+    "proofPurpose": "assertionMethod",
+    "verificationMethod": "did:reclaim:1234#key-1",
+    "jws": "eyJhbGciOiJSUzI1NiIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..TCYt5X
+      sITJX1CxPCT8yAV-TVkIEq_PbChOMqsLfRoPsnsgw5WEuts01mq-pQy7UJiN5mgRxD-WUc
+      X16dUEMGlv50aqzpqh4Qktb3rk-BuQy72IFLOqV0G_zS245-kronKb78cPN25DGlcTwLtj
+      PAYuNzVBAh4vGHSrQyHUdBBPM"
+  }
+}