[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34500 - gnunet/src/scalarproduct
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34500 - gnunet/src/scalarproduct |
Date: |
Sun, 7 Dec 2014 22:55:41 +0100 |
Author: grothoff
Date: 2014-12-07 22:55:41 +0100 (Sun, 07 Dec 2014)
New Revision: 34500
Modified:
gnunet/src/scalarproduct/gnunet-service-scalarproduct.h
gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c
gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c
Log:
-simplify further, too much checking...
Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct.h
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct.h 2014-12-07
21:53:44 UTC (rev 34499)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct.h 2014-12-07
21:55:41 UTC (rev 34500)
@@ -101,16 +101,6 @@
struct GNUNET_MessageHeader header;
/**
- * For alignment, always zero.
- */
- uint32_t reserved GNUNET_PACKED;
-
- /**
- * How many elements the Bob has in the intersection (in NBO).
- */
- uint32_t intersection_element_count GNUNET_PACKED;
-
- /**
* How many elements this individual message delivers (in NBO).
*/
uint32_t contained_element_count GNUNET_PACKED;
Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c
2014-12-07 21:53:44 UTC (rev 34499)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c
2014-12-07 21:55:41 UTC (rev 34500)
@@ -731,13 +731,6 @@
return GNUNET_SYSERR;
}
msg = (const struct BobCryptodataMessage *) message;
- GNUNET_break_op (0 == ntohl (msg->reserved));
- if (s->used_element_count != ntohl (msg->intersection_element_count))
- {
- /* Alice and Bob disagree on intersection set size, bad news! */
- GNUNET_break_op (0);
- return GNUNET_SYSERR;
- }
contained = ntohl (msg->contained_element_count);
required_size = sizeof (struct BobCryptodataMessage)
+ 2 * contained * sizeof (struct GNUNET_CRYPTO_PaillierCiphertext)
Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c 2014-12-07
21:53:44 UTC (rev 34499)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c 2014-12-07
21:55:41 UTC (rev 34500)
@@ -595,8 +595,6 @@
(2 + s->cadet_transmitted_element_count * 2)
* sizeof (struct GNUNET_CRYPTO_PaillierCiphertext),
GNUNET_MESSAGE_TYPE_SCALARPRODUCT_BOB_CRYPTODATA);
- msg->reserved = htonl (0);
- msg->intersection_element_count = htonl (s->used_element_count);
msg->contained_element_count = htonl (s->cadet_transmitted_element_count);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34500 - gnunet/src/scalarproduct,
gnunet <=