diff options
Diffstat (limited to 'src/json')
| -rw-r--r-- | src/json/json_generator.c | 4 | ||||
| -rw-r--r-- | src/json/json_helper.c | 12 | ||||
| -rw-r--r-- | src/json/test_json.c | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/json/json_generator.c b/src/json/json_generator.c index 4b1ac31b16..e660e10c53 100644 --- a/src/json/json_generator.c +++ b/src/json/json_generator.c @@ -106,7 +106,7 @@ GNUNET_JSON_from_time_rel (struct GNUNET_TIME_Relative stamp) * @return corresponding JSON encoding */ json_t * -GNUNET_JSON_from_rsa_public_key (const struct GNUNET_CRYPTO_rsa_PublicKey *pk) +GNUNET_JSON_from_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey *pk) { char *buf; size_t buf_len; @@ -128,7 +128,7 @@ GNUNET_JSON_from_rsa_public_key (const struct GNUNET_CRYPTO_rsa_PublicKey *pk) * @return corresponding JSON encoding */ json_t * -GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_rsa_Signature *sig) +GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *sig) { char *buf; size_t buf_len; diff --git a/src/json/json_helper.c b/src/json/json_helper.c index cf84ae997a..7265dfa668 100644 --- a/src/json/json_helper.c +++ b/src/json/json_helper.c @@ -690,7 +690,7 @@ parse_rsa_public_key (void *cls, json_t *root, struct GNUNET_JSON_Specification *spec) { - struct GNUNET_CRYPTO_rsa_PublicKey **pk = spec->ptr; + struct GNUNET_CRYPTO_RsaPublicKey **pk = spec->ptr; const char *enc; char *buf; size_t len; @@ -736,7 +736,7 @@ static void clean_rsa_public_key (void *cls, struct GNUNET_JSON_Specification *spec) { - struct GNUNET_CRYPTO_rsa_PublicKey **pk = spec->ptr; + struct GNUNET_CRYPTO_RsaPublicKey **pk = spec->ptr; if (NULL != *pk) { @@ -754,7 +754,7 @@ clean_rsa_public_key (void *cls, */ struct GNUNET_JSON_Specification GNUNET_JSON_spec_rsa_public_key (const char *name, - struct GNUNET_CRYPTO_rsa_PublicKey **pk) + struct GNUNET_CRYPTO_RsaPublicKey **pk) { struct GNUNET_JSON_Specification ret = { .parser = &parse_rsa_public_key, @@ -782,7 +782,7 @@ parse_rsa_signature (void *cls, json_t *root, struct GNUNET_JSON_Specification *spec) { - struct GNUNET_CRYPTO_rsa_Signature **sig = spec->ptr; + struct GNUNET_CRYPTO_RsaSignature **sig = spec->ptr; size_t size; const char *str; int res; @@ -828,7 +828,7 @@ static void clean_rsa_signature (void *cls, struct GNUNET_JSON_Specification *spec) { - struct GNUNET_CRYPTO_rsa_Signature **sig = spec->ptr; + struct GNUNET_CRYPTO_RsaSignature **sig = spec->ptr; if (NULL != *sig) { @@ -846,7 +846,7 @@ clean_rsa_signature (void *cls, */ struct GNUNET_JSON_Specification GNUNET_JSON_spec_rsa_signature (const char *name, - struct GNUNET_CRYPTO_rsa_Signature **sig) + struct GNUNET_CRYPTO_RsaSignature **sig) { struct GNUNET_JSON_Specification ret = { .parser = &parse_rsa_signature, diff --git a/src/json/test_json.c b/src/json/test_json.c index a334bf599a..6f1ca565ae 100644 --- a/src/json/test_json.c +++ b/src/json/test_json.c @@ -150,19 +150,19 @@ test_raw () static int test_rsa () { - struct GNUNET_CRYPTO_rsa_PublicKey *pub; - struct GNUNET_CRYPTO_rsa_PublicKey *pub2; + struct GNUNET_CRYPTO_RsaPublicKey *pub; + struct GNUNET_CRYPTO_RsaPublicKey *pub2; struct GNUNET_JSON_Specification pspec[] = { GNUNET_JSON_spec_rsa_public_key (NULL, &pub2), GNUNET_JSON_spec_end() }; - struct GNUNET_CRYPTO_rsa_Signature *sig; - struct GNUNET_CRYPTO_rsa_Signature *sig2; + struct GNUNET_CRYPTO_RsaSignature *sig; + struct GNUNET_CRYPTO_RsaSignature *sig2; struct GNUNET_JSON_Specification sspec[] = { GNUNET_JSON_spec_rsa_signature (NULL, &sig2), GNUNET_JSON_spec_end() }; - struct GNUNET_CRYPTO_rsa_PrivateKey *priv; + struct GNUNET_CRYPTO_RsaPrivateKey *priv; char msg[] = "Hello"; json_t *jp; json_t *js; |