aboutsummaryrefslogtreecommitdiff
path: root/src/abe
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-11-24 19:13:00 +0100
committerChristian Grothoff <christian@grothoff.org>2019-11-24 19:13:00 +0100
commitd17a17ea785f91c18b5694eab3372c4e4564d95e (patch)
treea7ee983fb1c0fa5a9210938024357cd9498ee344 /src/abe
parent5f38569fce2e77afeed58cbd3429c67bf8ab9109 (diff)
downloadgnunet-d17a17ea785f91c18b5694eab3372c4e4564d95e.tar.gz
gnunet-d17a17ea785f91c18b5694eab3372c4e4564d95e.zip
fix pointer indentation
Diffstat (limited to 'src/abe')
-rw-r--r--src/abe/abe.c20
-rw-r--r--src/abe/test_cpabe.c4
2 files changed, 12 insertions, 12 deletions
diff --git a/src/abe/abe.c b/src/abe/abe.c
index dbd722ca3..a03944821 100644
--- a/src/abe/abe.c
+++ b/src/abe/abe.c
@@ -56,7 +56,7 @@ init_aes (element_t k, int enc,
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 GNUNET_memcpy (key->aes_key, key_buf, GNUNET_CRYPTO_AES_KEY_LENGTH); 62 GNUNET_memcpy (key->aes_key, key_buf, GNUNET_CRYPTO_AES_KEY_LENGTH);
@@ -247,15 +247,15 @@ write_cpabe (void **result,
247 247
248 *result = GNUNET_malloc (12 + cph_buf_len + aes_buf_len); 248 *result = GNUNET_malloc (12 + cph_buf_len + aes_buf_len);
249 ptr = *result; 249 ptr = *result;
250 len = (uint32_t*) ptr; 250 len = (uint32_t *) ptr;
251 *len = htonl (file_len); 251 *len = htonl (file_len);
252 ptr += 4; 252 ptr += 4;
253 len = (uint32_t*) ptr; 253 len = (uint32_t *) ptr;
254 *len = htonl (aes_buf_len); 254 *len = htonl (aes_buf_len);
255 ptr += 4; 255 ptr += 4;
256 GNUNET_memcpy (ptr, aes_buf, aes_buf_len); 256 GNUNET_memcpy (ptr, aes_buf, aes_buf_len);
257 ptr += aes_buf_len; 257 ptr += aes_buf_len;
258 len = (uint32_t*) ptr; 258 len = (uint32_t *) ptr;
259 *len = htonl (cph_buf_len); 259 *len = htonl (cph_buf_len);
260 ptr += 4; 260 ptr += 4;
261 GNUNET_memcpy (ptr, cph_buf, cph_buf_len); 261 GNUNET_memcpy (ptr, cph_buf, cph_buf_len);
@@ -274,17 +274,17 @@ read_cpabe (const void *data,
274 char *ptr; 274 char *ptr;
275 uint32_t *len; 275 uint32_t *len;
276 276
277 ptr = (char*) data; 277 ptr = (char *) data;
278 len = (uint32_t*) ptr; 278 len = (uint32_t *) ptr;
279 buf_len = ntohl (*len); 279 buf_len = ntohl (*len);
280 ptr += 4; 280 ptr += 4;
281 len = (uint32_t*) ptr; 281 len = (uint32_t *) ptr;
282 *aes_buf_len = ntohl (*len); 282 *aes_buf_len = ntohl (*len);
283 ptr += 4; 283 ptr += 4;
284 *aes_buf = GNUNET_malloc (*aes_buf_len); 284 *aes_buf = GNUNET_malloc (*aes_buf_len);
285 GNUNET_memcpy (*aes_buf, ptr, *aes_buf_len); 285 GNUNET_memcpy (*aes_buf, ptr, *aes_buf_len);
286 ptr += *aes_buf_len; 286 ptr += *aes_buf_len;
287 len = (uint32_t*) ptr; 287 len = (uint32_t *) ptr;
288 *cph_buf_len = ntohl (*len); 288 *cph_buf_len = ntohl (*len);
289 ptr += 4; 289 ptr += 4;
290 *cph_buf = GNUNET_malloc (*cph_buf_len); 290 *cph_buf = GNUNET_malloc (*cph_buf_len);
@@ -321,7 +321,7 @@ GNUNET_ABE_cpabe_encrypt (const void *block,
321 int aes_buf_len; 321 int aes_buf_len;
322 ssize_t result_len; 322 ssize_t result_len;
323 323
324 if (! (cph = gabe_enc (key->pub, m, (char*) policy))) 324 if (! (cph = gabe_enc (key->pub, m, (char *) policy)))
325 return GNUNET_SYSERR; 325 return GNUNET_SYSERR;
326 cph_buf_len = gabe_cph_serialize (cph, 326 cph_buf_len = gabe_cph_serialize (cph,
327 &cph_buf); 327 &cph_buf);
@@ -378,7 +378,7 @@ GNUNET_ABE_cpabe_decrypt (const void *block,
378 } 378 }
379 gabe_cph_free (cph); 379 gabe_cph_free (cph);
380 GNUNET_free (cph); 380 GNUNET_free (cph);
381 plt_len = aes_128_cbc_decrypt (aes_buf, aes_buf_size, m, (char**) result); 381 plt_len = aes_128_cbc_decrypt (aes_buf, aes_buf_size, m, (char **) result);
382 GNUNET_free (cph_buf); 382 GNUNET_free (cph_buf);
383 GNUNET_free (aes_buf); 383 GNUNET_free (aes_buf);
384 element_clear (m); 384 element_clear (m);
diff --git a/src/abe/test_cpabe.c b/src/abe/test_cpabe.c
index 2ac4ef0a8..aefb0f99f 100644
--- a/src/abe/test_cpabe.c
+++ b/src/abe/test_cpabe.c
@@ -43,7 +43,7 @@ testAbecipher ()
43 size = GNUNET_ABE_cpabe_encrypt (TESTSTRING, strlen (TESTSTRING) + 1, 43 size = GNUNET_ABE_cpabe_encrypt (TESTSTRING, strlen (TESTSTRING) + 1,
44 "testattr", // Policy 44 "testattr", // Policy
45 msk, 45 msk,
46 (void*) &result); 46 (void *) &result);
47 GNUNET_assert (-1 != size); 47 GNUNET_assert (-1 != size);
48 attrs = GNUNET_malloc (2 * sizeof(char*)); 48 attrs = GNUNET_malloc (2 * sizeof(char*));
49 attrs[0] = "testattr"; 49 attrs[0] = "testattr";
@@ -53,7 +53,7 @@ testAbecipher ()
53 53
54 size = GNUNET_ABE_cpabe_decrypt (result, size, 54 size = GNUNET_ABE_cpabe_decrypt (result, size,
55 key, 55 key,
56 (void*) &res); 56 (void *) &res);
57 if (strlen (TESTSTRING) + 1 != size) 57 if (strlen (TESTSTRING) + 1 != size)
58 { 58 {
59 printf ("abeciphertest failed: decryptBlock returned %d\n", size); 59 printf ("abeciphertest failed: decryptBlock returned %d\n", size);