diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-09-05 18:52:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-09-05 18:52:35 +0000 |
commit | 1d89d84649d80a26ef39017d8a6f7edf5cb8d0c4 (patch) | |
tree | b2c554568f2dcf08e78a2d90d8f3d1f9dc9d3e29 /src/scalarproduct | |
parent | 14f9ba0d86025dfd2defb1635899c75da4815d16 (diff) | |
download | gnunet-1d89d84649d80a26ef39017d8a6f7edf5cb8d0c4.tar.gz gnunet-1d89d84649d80a26ef39017d8a6f7edf5cb8d0c4.zip |
-fix computation
Diffstat (limited to 'src/scalarproduct')
-rw-r--r-- | src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c | 2 | ||||
-rw-r--r-- | src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c index 773682234..4bb67c10a 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c | |||
@@ -469,6 +469,8 @@ compute_scalar_product (struct AliceServiceSession *session, | |||
469 | if (MAX_RESULT == ai_bi) | 469 | if (MAX_RESULT == ai_bi) |
470 | { | 470 | { |
471 | /* result too big */ | 471 | /* result too big */ |
472 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
473 | "Scalar product result out of range\n"); | ||
472 | return NULL; | 474 | return NULL; |
473 | } | 475 | } |
474 | ret = gcry_mpi_new (0); | 476 | ret = gcry_mpi_new (0); |
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c index 80a0dc941..7e2fc0bbf 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | |||
@@ -646,7 +646,7 @@ handle_alices_cryptodata_message (void *cls, | |||
646 | an upper bound on the required array size */ | 646 | an upper bound on the required array size */ |
647 | max = GNUNET_CONTAINER_multihashmap_size (s->intersected_elements); | 647 | max = GNUNET_CONTAINER_multihashmap_size (s->intersected_elements); |
648 | msg_length = sizeof (struct EccAliceCryptodataMessage) | 648 | msg_length = sizeof (struct EccAliceCryptodataMessage) |
649 | + contained_elements * sizeof (struct GNUNET_CRYPTO_EccPoint); | 649 | + contained_elements * sizeof (struct GNUNET_CRYPTO_EccPoint) * 2; |
650 | if ( (msize != msg_length) || | 650 | if ( (msize != msg_length) || |
651 | (0 == contained_elements) || | 651 | (0 == contained_elements) || |
652 | (contained_elements > UINT16_MAX) || | 652 | (contained_elements > UINT16_MAX) || |