diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-06-02 12:52:05 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-06-02 12:52:05 +0200 |
| commit | 401745fc302370a983aab7eb347a6ea75b7d1e2e (patch) | |
| tree | 0fe9b6429ae6f34784414352eb928c2188a22901 /src/util/json.c | |
| parent | 68a8c36f061853406f93312780162cdf57382d3f (diff) | |
| download | exchange-401745fc302370a983aab7eb347a6ea75b7d1e2e.tar.gz exchange-401745fc302370a983aab7eb347a6ea75b7d1e2e.tar.bz2 exchange-401745fc302370a983aab7eb347a6ea75b7d1e2e.zip | |
-include wallet headers if compiling wallet library
Diffstat (limited to 'src/util/json.c')
| -rw-r--r-- | src/util/json.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/util/json.c b/src/util/json.c index 34e41e0d7..606683598 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -19,7 +19,12 @@ * @author Sree Harsha Totakura <sreeharsha@totakura.in> */ #include "platform.h" +#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H +#include <gnunet/gnunet_util_taler_wallet_lib.h> +#endif +#if HAVE_GNUNET_GNUNET_UTIL_LIB_H #include <gnunet/gnunet_util_lib.h> +#endif #include "taler_util.h" /** @@ -155,7 +160,7 @@ TALER_json_from_rsa_public_key (struct GNUNET_CRYPTO_rsa_PublicKey *pk) /** * Convert JSON to RSA public key. * - * @param pk JSON encoding to convert + * @param pk JSON encoding to convert * @return corresponding public key */ struct GNUNET_CRYPTO_rsa_PublicKey * @@ -172,10 +177,10 @@ TALER_json_to_rsa_public_key (json_t *json) len = strlen (enc); buf_len = (len * 5) / 8; buf = GNUNET_malloc (buf_len); - EXITIF (GNUNET_OK != - GNUNET_STRINGS_string_to_data (enc, - len, - buf, + EXITIF (GNUNET_OK != + GNUNET_STRINGS_string_to_data (enc, + len, + buf, buf_len)); EXITIF (NULL == (pk = GNUNET_CRYPTO_rsa_public_key_decode (buf, buf_len))); @@ -190,7 +195,7 @@ TALER_json_to_rsa_public_key (json_t *json) /** * Convert JSON to RSA signature. * - * @param pk JSON encoding to convert + * @param pk JSON encoding to convert * @return corresponding signature */ struct GNUNET_CRYPTO_rsa_Signature * @@ -207,10 +212,10 @@ TALER_json_to_rsa_signature (json_t *json) len = strlen (enc); buf_len = (len * 5) / 8; buf = GNUNET_malloc (buf_len); - EXITIF (GNUNET_OK != - GNUNET_STRINGS_string_to_data (enc, - len, - buf, + EXITIF (GNUNET_OK != + GNUNET_STRINGS_string_to_data (enc, + len, + buf, buf_len)); EXITIF (NULL == (sig = GNUNET_CRYPTO_rsa_signature_decode (buf, buf_len))); |