taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

finishing implementation of #3516

Browse Source
This commit is contained in:
Christian Grothoff 2015-06-22 14:36:01 +02:00
parent f0c8858825
commit 3954fbe8c0
2 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/mint-lib/mint_api_json.c
View File

@ -202,12 +202,40 @@ parse_json (json_t *root,
case MAJ_CMD_EDDSA_SIGNATURE:
{
/* FIXME: parse the JSON signature
and the purpose, then check that the
signature is valid and the size field
is also correct; if all checks out,
return the purpose */
GNUNET_break (0); // FIXME: implement! #3516
struct TALER_CoinSpendSignatureP sig;
struct GNUNET_CRYPTO_EccSignaturePurpose *purpose;
size_t size;
struct MAJ_Specification sig_spec[] = {
MAJ_spec_fixed_auto ("eddsa_sig", &sig),
MAJ_spec_varsize ("eddsa_val", (void**) &purpose, &size),
MAJ_spec_end
};
if (GNUNET_OK !=
MAJ_parse_json (pos,
sig_spec))
{
GNUNET_break_op (0);
MAJ_parse_free (sig_spec);
return i;
}
if (size != ntohl (purpose->size))
{
GNUNET_break_op (0);
MAJ_parse_free (sig_spec);
return i;
}
if (GNUNET_OK !=
GNUNET_CRYPTO_eddsa_verify (ntohl (purpose->purpose),
purpose,
&sig.eddsa_signature,
spec[i].details.eddsa_signature.pub_key))
{
GNUNET_break_op (0);
MAJ_parse_free (sig_spec);
return i;
}
*spec[i].details.eddsa_signature.purpose_p = purpose;
}
break;

11
src/mint-lib/mint_api_json.h
View File

@ -218,6 +218,17 @@ MAJ_parse_free (struct MAJ_Specification *spec);
#define MAJ_spec_fixed_auto(name,obj) { .cmd = MAJ_CMD_BINARY_FIXED, .field = name, .details.fixed_data.dest = obj, .details.fixed_data.dest_size = sizeof (*obj) }
/**
* Variable size object (in network byte order, encoded using Crockford
* Base32hex encoding).
*
* @param name name of the JSON field
* @param obj_ptr pointer where to write the data (a `void **`)
* @param size where to store the number of bytes allocated for @a obj (of type `size_t *`
*/
#define MAJ_spec_varsize(name,obj,size) { .cmd = MAJ_CMD_BINARY_VARIABLE, .field = name, .details.variable_data.dest_p = obj, .details.variable_data.dest_size_p = size }
/**
* Absolute time.
*