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

finish porting lib

Browse Source
This commit is contained in:
Christian Grothoff 2015-01-26 12:29:58 +01:00
parent e1a0d89847
commit 986a89ea4f
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/taler_mint_service.h
View File

@ -21,7 +21,6 @@
#ifndef _TALER_MINT_SERVICE_H #ifndef _TALER_MINT_SERVICE_H
#define _TALER_MINT_SERVICE_H #define _TALER_MINT_SERVICE_H
#include "taler_rsa.h"
#include "taler_util.h" #include "taler_util.h"
#include <jansson.h> #include <jansson.h>

23
src/lib/mint_api.c
View File

@ -343,6 +343,8 @@ parse_json_denomkey (struct TALER_MINT_DenomPublicKey **_denom_key,
const char *withdraw_valid_until_enc; const char *withdraw_valid_until_enc;
const char *valid_from_enc; const char *valid_from_enc;
const char *key_enc; const char *key_enc;
char *buf;
size_t buf_size;
struct TALER_MINT_DenomPublicKey *denom_key; struct TALER_MINT_DenomPublicKey *denom_key;
struct GNUNET_TIME_Absolute valid_from; struct GNUNET_TIME_Absolute valid_from;
struct GNUNET_TIME_Absolute withdraw_valid_until; struct GNUNET_TIME_Absolute withdraw_valid_until;
@ -366,19 +368,29 @@ parse_json_denomkey (struct TALER_MINT_DenomPublicKey **_denom_key,
EXITIF (NULL == (withdraw_valid_until_enc = json_string_value (obj))); EXITIF (NULL == (withdraw_valid_until_enc = json_string_value (obj)));
EXITIF (NULL == (obj = json_object_get (denom_key_obj, "stamp_start"))); EXITIF (NULL == (obj = json_object_get (denom_key_obj, "stamp_start")));
EXITIF (NULL == (valid_from_enc = json_string_value (obj))); EXITIF (NULL == (valid_from_enc = json_string_value (obj)));
EXITIF (NULL == (obj = json_object_get (denom_key_obj, "denom_pub"))); EXITIF (NULL == (obj = json_object_get (denom_key_obj, "denom_pub")));
EXITIF (NULL == (key_enc = json_string_value (obj))); EXITIF (NULL == (key_enc = json_string_value (obj)));
EXITIF (52 != strlen (key_enc)); /* strlen(base32(char[32])) = 52 */
EXITIF (GNUNET_SYSERR == parse_timestamp (&valid_from, valid_from_enc)); EXITIF (GNUNET_SYSERR == parse_timestamp (&valid_from, valid_from_enc));
EXITIF (GNUNET_SYSERR == parse_timestamp (&withdraw_valid_until, EXITIF (GNUNET_SYSERR == parse_timestamp (&withdraw_valid_until,
withdraw_valid_until_enc)); withdraw_valid_until_enc));
EXITIF (GNUNET_SYSERR == parse_timestamp (&deposit_valid_until, EXITIF (GNUNET_SYSERR == parse_timestamp (&deposit_valid_until,
deposit_valid_until_enc)); deposit_valid_until_enc));
(void) memset (&denom_key_issue, 0, sizeof (denom_key_issue)); memset (&denom_key_issue, 0, sizeof (denom_key_issue));
EXITIF (GNUNET_OK != GNUNET_STRINGS_string_to_data (key_enc, 52,
&denom_key_issue.denom_pub, buf_size = (strlen (key_enc) * 5) / 8;
sizeof (struct TALER_RSA_PublicKeyBinaryEncoded))); buf = GNUNET_malloc (buf_size);
EXITIF (GNUNET_OK !=
GNUNET_STRINGS_string_to_data (key_enc, strlen (key_enc),
buf,
buf_size));
denom_key_issue.denom_pub = GNUNET_CRYPTO_rsa_public_key_decode (buf, buf_size);
GNUNET_free (buf);
EXITIF (NULL == denom_key_issue.denom_pub);
EXITIF (NULL == (obj = json_object_get (denom_key_obj, "value"))); EXITIF (NULL == (obj = json_object_get (denom_key_obj, "value")));
EXITIF (GNUNET_SYSERR == parse_json_amount (obj, &value)); EXITIF (GNUNET_SYSERR == parse_json_amount (obj, &value));
EXITIF (NULL == (obj = json_object_get (denom_key_obj, "fee_withdraw"))); EXITIF (NULL == (obj = json_object_get (denom_key_obj, "fee_withdraw")));
@ -420,6 +432,7 @@ parse_json_denomkey (struct TALER_MINT_DenomPublicKey **_denom_key,
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
static int static int
parse_response_keys_get (const char *in, size_t size, parse_response_keys_get (const char *in, size_t size,
struct TALER_MINT_SigningPublicKey ***_sign_keys, struct TALER_MINT_SigningPublicKey ***_sign_keys,