aboutsummaryrefslogtreecommitdiff
path: root/src/util/crypto_abe.c
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2017-09-16 22:39:15 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2017-09-16 22:39:15 +0200
commit67e0d73709ef557b52ba0527291d68c17fd6c60a (patch)
tree57dcf9848b436c01c3fc37e3d878445aaf142a4e /src/util/crypto_abe.c
parentd5ec12fdbc288f376ee2ee18aceb00e338191f28 (diff)
downloadgnunet-67e0d73709ef557b52ba0527291d68c17fd6c60a.tar.gz
gnunet-67e0d73709ef557b52ba0527291d68c17fd6c60a.zip
-various fixes; add attribute list API
Diffstat (limited to 'src/util/crypto_abe.c')
-rw-r--r--src/util/crypto_abe.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/util/crypto_abe.c b/src/util/crypto_abe.c
index 25d04fba6..899965159 100644
--- a/src/util/crypto_abe.c
+++ b/src/util/crypto_abe.c
@@ -168,7 +168,6 @@ GNUNET_CRYPTO_cpabe_create_key (struct GNUNET_CRYPTO_AbeMasterKey *key,
168 char **attrs) 168 char **attrs)
169{ 169{
170 struct GNUNET_CRYPTO_AbeKey *prv_key; 170 struct GNUNET_CRYPTO_AbeKey *prv_key;
171 prv_key = GNUNET_new (struct GNUNET_CRYPTO_AbeKey);
172 int size; 171 int size;
173 char *tmp; 172 char *tmp;
174 173
@@ -249,7 +248,7 @@ read_cpabe (const void *data,
249ssize_t 248ssize_t
250GNUNET_CRYPTO_cpabe_encrypt (const void *block, 249GNUNET_CRYPTO_cpabe_encrypt (const void *block,
251 size_t size, 250 size_t size,
252 char *policy, 251 const char *policy,
253 const struct GNUNET_CRYPTO_AbeMasterKey *key, 252 const struct GNUNET_CRYPTO_AbeMasterKey *key,
254 void **result) 253 void **result)
255{ 254{
@@ -262,7 +261,7 @@ GNUNET_CRYPTO_cpabe_encrypt (const void *block,
262 int aes_buf_len; 261 int aes_buf_len;
263 ssize_t result_len; 262 ssize_t result_len;
264 263
265 if( !(cph = gabe_enc(key->pub, m, policy)) ) 264 if( !(cph = gabe_enc(key->pub, m, (char*)policy)) )
266 return GNUNET_SYSERR; 265 return GNUNET_SYSERR;
267 cph_buf_len = gabe_cph_serialize(cph, 266 cph_buf_len = gabe_cph_serialize(cph,
268 &cph_buf); 267 &cph_buf);