diff options
| -rw-r--r-- | doc/paper/taler.tex | 5 | ||||
| -rw-r--r-- | src/mint/taler-mint-httpd_admin.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/paper/taler.tex b/doc/paper/taler.tex index 59a093015..5baa5a81e 100644 --- a/doc/paper/taler.tex +++ b/doc/paper/taler.tex @@ -816,9 +816,10 @@ generator of the elliptic curve. that represents the public key $T^{(i)}_p$ of the transfer key $T^{(i)}$. This is basically DH between coin and transfer key.), \end{itemize} and commits $\langle C', \vec{T}, \vec{C}, \vec{b} \rangle$ to disk. - \item The customer computes $B^{(i)} := B_{b^{(i)}}(C^{(i)}_p)$ for $i \in 1,\ldots,\kappa$ and sends a commitment + \item The customer computes $B^{(i)} := B_{b^{(i)}}(C^{(i)}_p)$ for $i \in \{1,\ldots,\kappa\}$ and sends a commitment $S_{C'}(\vec{E}, \vec{B}, \vec{T_p}))$ to the mint. - \item The mint generates a random $\gamma$ with $1 \le \gamma \le \kappa$ and + \item The mint generates a random\footnote{Auditing processes need to assure $\gamma$ is unpredictable until this time to + prevent the mint from assisting tax evasion.} $\gamma$ with $1 \le \gamma \le \kappa$ and marks $C'_p$ as spent by committing $\langle C', \gamma, S_{C'}(\vec{E}, \vec{B}, \vec{T}) \rangle$ to disk. \item The mint sends $S_K(C'_p, \gamma)$ to the customer.\footnote{Instead of $K$, it is also diff --git a/src/mint/taler-mint-httpd_admin.c b/src/mint/taler-mint-httpd_admin.c index 1368fe05a..373c444a1 100644 --- a/src/mint/taler-mint-httpd_admin.c +++ b/src/mint/taler-mint-httpd_admin.c @@ -139,12 +139,18 @@ TMH_ADMIN_handler_admin_add_incoming (struct TMH_RequestHandler *rh, json_decref (root); if (GNUNET_OK != res) { +<<<<<<< HEAD + GNUNET_break_op (0); + json_decref (root); +======= +>>>>>>> 1bfba318ec0f3393de2dfc66821dec6165eef90a return (GNUNET_SYSERR == res) ? MHD_NO : MHD_YES; } if (GNUNET_YES != TALER_json_validate_wireformat (TMH_expected_wire_formats, wire)) { + GNUNET_break_op (0); TMH_PARSE_release_data (spec); return TMH_RESPONSE_reply_arg_unknown (connection, "wire"); |