2 files changed, 51 insertions, 0 deletions

diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index 203976b5c..0b6b299d1 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -966,6 +966,19 @@ GNUNET_JSON_pack_rsa_signature (const char *name,
                                 const struct GNUNET_CRYPTO_RsaSignature *sig);
 
 
+/**
+ * Generate packer instruction for a JSON field of type
+ * unblinded signature.
+ *
+ * @param name name of the field to add to the object
+ * @param sig unblinded signature
+ * @return json pack specification
+ */
+struct GNUNET_JSON_PackSpec
+GNUNET_JSON_pack_unblinded_signature (const char *name,
+                                      const struct GNUNET_CRYPTO_UnblindedSignature *sig);
+
+
 #endif
 
 /* end of gnunet_json_lib.h */
diff --git a/src/lib/json/json_pack.c b/src/lib/json/json_pack.c
index 18487c3f4..40cd55c1c 100644
--- a/src/lib/json/json_pack.c
+++ b/src/lib/json/json_pack.c
@@ -24,6 +24,7 @@
  */
 #include "platform.h"
 #include "gnunet_json_lib.h"
+#include <gnunet/gnunet_json_lib.h>
 
 
 json_t *
@@ -364,4 +365,41 @@ GNUNET_JSON_pack_rsa_signature (const char *name,
 }
 
 
+struct GNUNET_JSON_PackSpec
+GNUNET_JSON_pack_unblinded_signature (const char *name,
+                                      const struct GNUNET_CRYPTO_UnblindedSignature *sig)
+{
+  struct GNUNET_JSON_PackSpec ps = {
+    .field_name = name
+  };
+
+  if (NULL == sig)
+    return ps;
+
+  switch (sig->cipher)
+  {
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    ps.object = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("cipher",
+                               "RSA"),
+      GNUNET_JSON_pack_rsa_signature ("rsa_signature",
+                                      sig->details.rsa_signature));
+    return ps;
+  case GNUNET_CRYPTO_BSA_CS:
+    ps.object = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("cipher",
+                               "CS"),
+      GNUNET_JSON_pack_data_auto ("cs_signature_r",
+                                  &sig->details.cs_signature.r_point),
+      GNUNET_JSON_pack_data_auto ("cs_signature_s",
+                                  &sig->details.cs_signature.s_scalar));
+    return ps;
+  }
+  GNUNET_assert (0);
+  return ps;
+}
+
+
 /* end of json_pack.c */