diff options
Diffstat (limited to 'crypto.c')
| -rw-r--r-- | crypto.c | 55 |
1 files changed, 31 insertions, 24 deletions
@@ -17,6 +17,7 @@ /** * @file crypto.c * @brief Implementation of the crypto primitives. + * @author Markus Teich */ @@ -86,18 +87,6 @@ brandt_crypto_init () } -/* --- RANDOM --- */ - -void -brandt_rand_poll () -{ - static unsigned char rand_amount = 255; - - if (!(rand_amount--)) - gcry_fast_random_poll (); -} - - /* --- HASHING --- */ /** @@ -299,8 +288,11 @@ mpi_parse (gcry_mpi_t dst, const struct ec_mpi *src) gcry_mpi_t ret; gcry_error_t rc; - rc = gcry_mpi_scan (&ret, GCRYMPI_FMT_USG, - src, sizeof (struct ec_mpi), NULL); + rc = gcry_mpi_scan (&ret, + GCRYMPI_FMT_USG, + src, + sizeof (struct ec_mpi), + NULL); brandt_assert_gpgerr (rc); gcry_mpi_snatch (dst, ret); @@ -369,6 +361,7 @@ ec_point_parse (gcry_mpi_point_t dst, const struct ec_mpi *src) brandt_assert (ret); gcry_ctx_release (ctx); gcry_mpi_ec_mul (dst, GCRYMPI_CONST_ONE, ret, ec_ctx); + gcry_mpi_point_release (ret); } @@ -382,7 +375,8 @@ ec_point_parse (gcry_mpi_point_t dst, const struct ec_mpi *src) static void smc_free2 (gcry_mpi_point_t **dst, uint16_t size1, uint16_t size2) { - uint16_t i, j; + uint16_t i; + uint16_t j; if (NULL == dst) return; @@ -406,7 +400,8 @@ smc_free2 (gcry_mpi_point_t **dst, uint16_t size1, uint16_t size2) static gcry_mpi_point_t ** smc_init2 (uint16_t size1, uint16_t size2) { - uint16_t i, j; + uint16_t i; + uint16_t j; gcry_mpi_point_t **ret; gcry_mpi_point_t *data; @@ -449,7 +444,9 @@ smc_free3 (gcry_mpi_point_t ***dst, uint16_t size2, uint16_t size3) { - uint16_t i, j, k; + uint16_t i; + uint16_t j; + uint16_t k; if (NULL == dst) return; @@ -475,7 +472,9 @@ smc_free3 (gcry_mpi_point_t ***dst, static gcry_mpi_point_t *** smc_init3 (uint16_t size1, uint16_t size2, uint16_t size3) { - uint16_t i, j, k; + uint16_t i; + uint16_t j; + uint16_t k; gcry_mpi_point_t ***ret; gcry_mpi_point_t **layer1; gcry_mpi_point_t *layer2; @@ -667,8 +666,12 @@ smc_encrypt_bid (struct AuctionData *ad, size_t *buflen) for (j = 0; j < ad->k; j++) { proof3 = (struct proof_0og *)(cur + 2 * sizeof (struct ec_mpi)); - smc_zkp_0og (j == ad->b, ad->Y, r_part, - ad->alpha[ad->i][j], ad->beta[ad->i][j], proof3); + smc_zkp_0og (j == ad->b, + ad->Y, + r_part, + ad->alpha[ad->i][j], + ad->beta[ad->i][j], + proof3); ec_point_serialize ((struct ec_mpi *)cur, ad->alpha[ad->i][j]); ec_point_serialize (&((struct ec_mpi *)cur)[1], ad->beta[ad->i][j]); gcry_mpi_addm (r_sum, r_sum, r_part, ec_n); @@ -726,7 +729,10 @@ smc_recv_encrypted_bid (struct AuctionData *ad, } gcry_mpi_ec_sub (alpha_sum, alpha_sum, ec_gen, ec_ctx); - if (smc_zkp_2dle_check (alpha_sum, beta_sum, ad->Y, ec_gen, + if (smc_zkp_2dle_check (alpha_sum, + beta_sum, + ad->Y, + ec_gen, (struct proof_2dle *)cur)) { weprintf ("wrong zkp2 for alpha, beta received"); @@ -757,7 +763,8 @@ quit: void smc_compute_outcome (struct AuctionData *ad) { - uint16_t i, j; + uint16_t i; + uint16_t j; // create temporary table with partial sums @@ -900,8 +907,8 @@ smc_zkp_2dle (gcry_mpi_point_t v, gcry_mpi_t c = gcry_mpi_new (0); gcry_mpi_t z = gcry_mpi_new (0); - rv = (NULL == v) ? rv = gcry_mpi_point_new (0) : v; - rw = (NULL == w) ? rw = gcry_mpi_point_new (0) : w; + rv = (NULL == v) ? gcry_mpi_point_new (0) : v; + rw = (NULL == w) ? gcry_mpi_point_new (0) : w; /* v = x*g1 */ gcry_mpi_ec_mul (rv, x, g1, ec_ctx); |