aboutsummaryrefslogtreecommitdiff
path: root/src/zklaim
diff options
context:
space:
mode:
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>2018-08-17 22:52:47 +0200
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>2018-08-17 22:52:47 +0200
commitf348649e3c2238bbe49c0b52cb940b114e86574f (patch)
treed6223c41e693511d176ca4ed228ee3dea932ea71 /src/zklaim
parent9c616547f2e77f01a3a8d1b50a764625e0269104 (diff)
downloadgnunet-f348649e3c2238bbe49c0b52cb940b114e86574f.tar.gz
gnunet-f348649e3c2238bbe49c0b52cb940b114e86574f.zip
cleanup
Diffstat (limited to 'src/zklaim')
-rw-r--r--src/zklaim/gnunet-zklaim.c12
-rw-r--r--src/zklaim/zklaim_functions.c14
2 files changed, 7 insertions, 19 deletions
diff --git a/src/zklaim/gnunet-zklaim.c b/src/zklaim/gnunet-zklaim.c
index 4146b983e..ef77b48e5 100644
--- a/src/zklaim/gnunet-zklaim.c
+++ b/src/zklaim/gnunet-zklaim.c
@@ -251,14 +251,9 @@ prove_iter (void *cls,
251 char *val; 251 char *val;
252 char *op; 252 char *op;
253 tmp = GNUNET_strdup (prove_predicate); 253 tmp = GNUNET_strdup (prove_predicate);
254 fprintf (stderr,
255 "%s\n",
256 prove_predicate);
257 attr = strtok (tmp, " "); 254 attr = strtok (tmp, " ");
258 while (NULL != attr) 255 while (NULL != attr)
259 { 256 {
260 fprintf (stderr,
261 "Got %s\n", attr);
262 op = strtok (NULL, " "); 257 op = strtok (NULL, " ");
263 if (NULL == op) 258 if (NULL == op)
264 break; 259 break;
@@ -275,7 +270,6 @@ prove_iter (void *cls,
275 fprintf (stderr, 270 fprintf (stderr,
276 "Failed parse %s %s %s\n", 271 "Failed parse %s %s %s\n",
277 attr, op, val); 272 attr, op, val);
278 fprintf (stdout, "Setting %s %s %lu\n", name, op, *ref);
279 attr = strtok (NULL, " "); 273 attr = strtok (NULL, " ");
280 } 274 }
281 GNUNET_free (tmp); 275 GNUNET_free (tmp);
@@ -322,15 +316,13 @@ handle_arguments ()
322 316
323 ctx = GNUNET_ZKLAIM_context_deserialize (data, 317 ctx = GNUNET_ZKLAIM_context_deserialize (data,
324 len); 318 len);
325 fprintf (stderr, 319 fprintf (stdout, "Proving %s...", prove_predicate);
326 "%s\n",
327 prove_predicate);
328 ret = GNUNET_ZKLAIM_context_prove_with_keyfile (ctx, 320 ret = GNUNET_ZKLAIM_context_prove_with_keyfile (ctx,
329 pkey_fn, 321 pkey_fn,
330 &prove_iter, 322 &prove_iter,
331 NULL); 323 NULL);
332 fprintf (stdout, 324 fprintf (stdout,
333 "Prove result: %d\n", ret); 325 "%s\n", ret ? "failed." : "success.");
334 } 326 }
335 cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); 327 cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
336} 328}
diff --git a/src/zklaim/zklaim_functions.c b/src/zklaim/zklaim_functions.c
index c24549ee4..0c6ea67cc 100644
--- a/src/zklaim/zklaim_functions.c
+++ b/src/zklaim/zklaim_functions.c
@@ -77,6 +77,11 @@ ZKLAIM_context_attributes_iterate (const struct GNUNET_ZKLAIM_Context *ctx,
77 zklaim_set_attr (&plw->pl, 77 zklaim_set_attr (&plw->pl,
78 data, 78 data,
79 j); 79 j);
80 if ((attr_name - tmp) == (strlen (attr_name) + 1))
81 {
82 attr_name = NULL;
83 break;
84 }
80 attr_name = strtok (attr_name + strlen (attr_name) + 1, ","); 85 attr_name = strtok (attr_name + strlen (attr_name) + 1, ",");
81 } 86 }
82 if (NULL == attr_name) 87 if (NULL == attr_name)
@@ -115,10 +120,6 @@ ZKLAIM_context_prove (struct GNUNET_ZKLAIM_Context *ctx,
115 tmp = GNUNET_strdup (ctx->attrs); 120 tmp = GNUNET_strdup (ctx->attrs);
116 attr_name = strtok (tmp, ","); 121 attr_name = strtok (tmp, ",");
117 plw = ctx->ctx->pl_ctx_head; 122 plw = ctx->ctx->pl_ctx_head;
118 fprintf (stderr,
119 "Num payloads: %lu, attrs: %s\n",
120 ctx->ctx->num_of_payloads,
121 ctx->attrs);
122 for (i = 0; i < ctx->ctx->num_of_payloads; i++) 123 for (i = 0; i < ctx->ctx->num_of_payloads; i++)
123 { 124 {
124 for (j = 0; j < ZKLAIM_MAX_PAYLOAD_ATTRIBUTES; j++) 125 for (j = 0; j < ZKLAIM_MAX_PAYLOAD_ATTRIBUTES; j++)
@@ -130,10 +131,6 @@ ZKLAIM_context_prove (struct GNUNET_ZKLAIM_Context *ctx,
130 plw = ctx->ctx->pl_ctx_head; 131 plw = ctx->ctx->pl_ctx_head;
131 for (i = 0; i < ctx->ctx->num_of_payloads; i++) 132 for (i = 0; i < ctx->ctx->num_of_payloads; i++)
132 { 133 {
133 fprintf (stderr,
134 "Payload #%d\n",
135 i);
136
137 for (j = 0; j < ZKLAIM_MAX_PAYLOAD_ATTRIBUTES; j++) 134 for (j = 0; j < ZKLAIM_MAX_PAYLOAD_ATTRIBUTES; j++)
138 { 135 {
139 136
@@ -156,7 +153,6 @@ ZKLAIM_context_prove (struct GNUNET_ZKLAIM_Context *ctx,
156 GNUNET_assert (NULL != plw); 153 GNUNET_assert (NULL != plw);
157 } 154 }
158 GNUNET_free (tmp); 155 GNUNET_free (tmp);
159 zklaim_print (ctx->ctx);
160 return zklaim_proof_generate (ctx->ctx); 156 return zklaim_proof_generate (ctx->ctx);
161} 157}
162 158