diff options
Diffstat (limited to 'src/abe/abe.c')
-rw-r--r-- | src/abe/abe.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/abe/abe.c b/src/abe/abe.c index 3f1f6dc5b..8b59953fb 100644 --- a/src/abe/abe.c +++ b/src/abe/abe.c | |||
@@ -54,12 +54,12 @@ init_aes( element_t k, int enc, | |||
54 | int rc; | 54 | int rc; |
55 | int key_len; | 55 | int key_len; |
56 | unsigned char* key_buf; | 56 | unsigned char* key_buf; |
57 | 57 | ||
58 | key_len = element_length_in_bytes(k) < 33 ? 3 : element_length_in_bytes(k); | 58 | key_len = element_length_in_bytes(k) < 33 ? 3 : element_length_in_bytes(k); |
59 | key_buf = (unsigned char*) malloc(key_len); | 59 | key_buf = (unsigned char*) malloc(key_len); |
60 | element_to_bytes(key_buf, k); | 60 | element_to_bytes(key_buf, k); |
61 | 61 | ||
62 | memcpy (key->aes_key, key_buf, GNUNET_CRYPTO_AES_KEY_LENGTH); | 62 | GNUNET_memcpy (key->aes_key, key_buf, GNUNET_CRYPTO_AES_KEY_LENGTH); |
63 | GNUNET_assert (0 == | 63 | GNUNET_assert (0 == |
64 | gcry_cipher_open (handle, GCRY_CIPHER_AES256, | 64 | gcry_cipher_open (handle, GCRY_CIPHER_AES256, |
65 | GCRY_CIPHER_MODE_CFB, 0)); | 65 | GCRY_CIPHER_MODE_CFB, 0)); |
@@ -124,16 +124,16 @@ aes_128_cbc_decrypt( char* ct, | |||
124 | unsigned char iv[16]; | 124 | unsigned char iv[16]; |
125 | char* tmp; | 125 | char* tmp; |
126 | uint32_t len; | 126 | uint32_t len; |
127 | 127 | ||
128 | init_aes(k, 1, &handle, &skey, iv); | 128 | init_aes(k, 1, &handle, &skey, iv); |
129 | 129 | ||
130 | tmp = GNUNET_malloc (size); | 130 | tmp = GNUNET_malloc (size); |
131 | 131 | ||
132 | //AES_cbc_encrypt(ct->data, pt->data, ct->len, &key, iv, AES_DECRYPT); | 132 | //AES_cbc_encrypt(ct->data, pt->data, ct->len, &key, iv, AES_DECRYPT); |
133 | GNUNET_assert (0 == gcry_cipher_decrypt (handle, tmp, size, ct, size)); | 133 | GNUNET_assert (0 == gcry_cipher_decrypt (handle, tmp, size, ct, size)); |
134 | gcry_cipher_close (handle); | 134 | gcry_cipher_close (handle); |
135 | /* TODO make less crufty */ | 135 | /* TODO make less crufty */ |
136 | 136 | ||
137 | /* get real length */ | 137 | /* get real length */ |
138 | len = 0; | 138 | len = 0; |
139 | len = len | 139 | len = len |
@@ -195,7 +195,7 @@ GNUNET_ABE_cpabe_create_key (struct GNUNET_ABE_AbeMasterKey *key, | |||
195 | struct GNUNET_ABE_AbeKey *prv_key; | 195 | struct GNUNET_ABE_AbeKey *prv_key; |
196 | int size; | 196 | int size; |
197 | char *tmp; | 197 | char *tmp; |
198 | 198 | ||
199 | prv_key = GNUNET_new (struct GNUNET_ABE_AbeKey); | 199 | prv_key = GNUNET_new (struct GNUNET_ABE_AbeKey); |
200 | prv_key->prv = gabe_keygen(key->pub, key->msk, attrs); | 200 | prv_key->prv = gabe_keygen(key->pub, key->msk, attrs); |
201 | size = gabe_pub_serialize(key->pub, &tmp); | 201 | size = gabe_pub_serialize(key->pub, &tmp); |
@@ -234,7 +234,7 @@ write_cpabe (void **result, | |||
234 | { | 234 | { |
235 | char *ptr; | 235 | char *ptr; |
236 | uint32_t *len; | 236 | uint32_t *len; |
237 | 237 | ||
238 | *result = GNUNET_malloc (12 + cph_buf_len + aes_buf_len); | 238 | *result = GNUNET_malloc (12 + cph_buf_len + aes_buf_len); |
239 | ptr = *result; | 239 | ptr = *result; |
240 | len = (uint32_t*) ptr; | 240 | len = (uint32_t*) ptr; |
@@ -243,12 +243,12 @@ write_cpabe (void **result, | |||
243 | len = (uint32_t*) ptr; | 243 | len = (uint32_t*) ptr; |
244 | *len = htonl (aes_buf_len); | 244 | *len = htonl (aes_buf_len); |
245 | ptr += 4; | 245 | ptr += 4; |
246 | memcpy (ptr, aes_buf, aes_buf_len); | 246 | GNUNET_memcpy (ptr, aes_buf, aes_buf_len); |
247 | ptr += aes_buf_len; | 247 | ptr += aes_buf_len; |
248 | len = (uint32_t*) ptr; | 248 | len = (uint32_t*) ptr; |
249 | *len = htonl (cph_buf_len); | 249 | *len = htonl (cph_buf_len); |
250 | ptr += 4; | 250 | ptr += 4; |
251 | memcpy (ptr, cph_buf, cph_buf_len); | 251 | GNUNET_memcpy (ptr, cph_buf, cph_buf_len); |
252 | return 12 + cph_buf_len + aes_buf_len; | 252 | return 12 + cph_buf_len + aes_buf_len; |
253 | } | 253 | } |
254 | 254 | ||
@@ -271,13 +271,13 @@ read_cpabe (const void *data, | |||
271 | *aes_buf_len = ntohl (*len); | 271 | *aes_buf_len = ntohl (*len); |
272 | ptr += 4; | 272 | ptr += 4; |
273 | *aes_buf = GNUNET_malloc (*aes_buf_len); | 273 | *aes_buf = GNUNET_malloc (*aes_buf_len); |
274 | memcpy(*aes_buf, ptr, *aes_buf_len); | 274 | GNUNET_memcpy(*aes_buf, ptr, *aes_buf_len); |
275 | ptr += *aes_buf_len; | 275 | ptr += *aes_buf_len; |
276 | len = (uint32_t*)ptr; | 276 | len = (uint32_t*)ptr; |
277 | *cph_buf_len = ntohl (*len); | 277 | *cph_buf_len = ntohl (*len); |
278 | ptr += 4; | 278 | ptr += 4; |
279 | *cph_buf = GNUNET_malloc (*cph_buf_len); | 279 | *cph_buf = GNUNET_malloc (*cph_buf_len); |
280 | memcpy(*cph_buf, ptr, *cph_buf_len); | 280 | GNUNET_memcpy(*cph_buf, ptr, *cph_buf_len); |
281 | 281 | ||
282 | return buf_len; | 282 | return buf_len; |
283 | } | 283 | } |
@@ -429,7 +429,7 @@ GNUNET_ABE_cpabe_deserialize_key (const void *data, | |||
429 | &prv_len); | 429 | &prv_len); |
430 | key->pub = gabe_pub_unserialize (pub, pub_len); | 430 | key->pub = gabe_pub_unserialize (pub, pub_len); |
431 | key->prv = gabe_prv_unserialize (key->pub, prv, prv_len); | 431 | key->prv = gabe_prv_unserialize (key->pub, prv, prv_len); |
432 | 432 | ||
433 | GNUNET_free (pub); | 433 | GNUNET_free (pub); |
434 | GNUNET_free (prv); | 434 | GNUNET_free (prv); |
435 | return key; | 435 | return key; |
@@ -491,7 +491,7 @@ GNUNET_ABE_cpabe_deserialize_master_key (const void *data, | |||
491 | &msk_len); | 491 | &msk_len); |
492 | key->pub = gabe_pub_unserialize (pub, pub_len); | 492 | key->pub = gabe_pub_unserialize (pub, pub_len); |
493 | key->msk = gabe_msk_unserialize (key->pub, msk, msk_len); | 493 | key->msk = gabe_msk_unserialize (key->pub, msk, msk_len); |
494 | 494 | ||
495 | GNUNET_free (pub); | 495 | GNUNET_free (pub); |
496 | GNUNET_free (msk); | 496 | GNUNET_free (msk); |
497 | 497 | ||