78f823f31e 
								
							
								 
							
						 
						
							
							
								
								new benes code passes tests  
							
							
							
						 
						
							2017-01-19 01:18:21 +02:00  
				
					
						
							
							
								 
						
							
							
								37d1857f9c 
								
							
								 
							
						 
						
							
							
								
								Working on Benes network/testing  
							
							
							
						 
						
							2017-01-18 21:54:42 +02:00  
				
					
						
							
							
								 
						
							
							
								abf4cc5e54 
								
							
								 
							
						 
						
							
							
								
								Add task to download protoc (protobuf compiler) to root-level build/ directory  
							
							
							
						 
						
							2017-01-18 21:54:22 +02:00  
				
					
						
							
							
								 
						
							
							
								0d416f0018 
								
							
								 
							
						 
						
							
							
								
								Rewriting Benes network code (in progress)  
							
							
							
						 
						
							2017-01-18 11:47:52 +02:00  
				
					
						
							
							
								 
						
							
							
								c2da5aa464 
								
							
								 
							
						 
						
							
							
								
								All tests pass  
							
							
							
						 
						
							2017-01-14 02:42:02 +02:00  
				
					
						
							
							
								 
						
							
							
								a5cceaa6c0 
								
							
								 
							
						 
						
							
							
								
								Writing tests for new ZKPs  
							
							
							
						 
						
							2017-01-12 11:05:38 +02:00  
				
					
						
							
							
								 
						
							
							
								723d348443 
								
							
								 
							
						 
						
							
							
								
								Working on mixing code rewrite  
							
							
							
						 
						
							2017-01-11 22:09:01 +02:00  
				
					
						
							
							
								 
						
							
							
								b7ef2c10e1 
								
							
								 
							
						 
						
							
							
								
								rewriting mixing proofs  
							
							
							
						 
						
							2017-01-11 17:01:14 +02:00  
				
					
						
							
							
								 
						
							
							
								aac7a50a94 
								
							
								 
							
						 
						
							
							
								
								Yet more mixer refactoring  
							
							
							
						 
						
							2016-11-02 11:59:20 +02:00  
				
					
						
							
							
								 
						
							
							
								5b268cd779 
								
							
								 
							
						 
						
							
							
								
								More refactoring for mixer  
							
							
							
						 
						
							2016-11-02 00:31:49 +02:00  
				
					
						
							
							
								 
						
							
							
								1baa567d8e 
								
							
								 
							
						 
						
							
							
								
								Starting to review and refactor mixer  
							
							
							
						 
						
							2016-11-01 18:03:53 +02:00  
				
					
						
							
							
								 
						
							
							
								63e26fdc16 
								
							
								 
							
						 
						
							
							
								
								Some documentation for versionup.pl  
							
							
							
						 
						
							2016-09-21 16:21:22 +03:00  
				
					
						
							
							
								 
						
							
							
								267164e996 
								
							
								 
							
						 
						
							
							
								
								Update to Gradle 3.1  
							
							
							
						 
						
							2016-09-21 16:19:45 +03:00  
				
					
						
							
							
								 
						
							
							
								f2ea4b5d15 
								
							
								 
							
						 
						
							
							
								
								Typo: fix typo in documentation  
							
							
							
						 
						
							2016-08-11 13:36:09 +03:00  
				
					
						
							
							
								 
						
							
							
								6b512e078b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into dist_dec  
							
							... 
							
							
							
							# Conflicts:
#	meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java
#	meerkat-common/src/main/proto/meerkat/BulletinBoardAPI.proto
#	settings.gradle 
							
						 
						
							2016-08-09 14:30:40 +03:00  
				
					
						
							
							
								 
						
							
							
								ce40a04ac7 
								
							
								 
							
						 
						
							
							
								
								Make code of SDKG test prettier  
							
							
							
						 
						
							2016-08-07 17:04:23 +03:00  
				
					
						
							
							
								 
						
							
							
								4ddd5f852a 
								
							
								 
							
						 
						
							
							
								
								Fix: better test of the NetworkVirtualPrinter  
							
							
							
						 
						
							2016-08-02 14:24:25 +03:00  
				
					
						
							
							
								 
						
							
							
								c78b78aa3c 
								
							
								 
							
						 
						
							
							
								
								no change  
							
							
							
						 
						
							2016-08-02 14:22:21 +03:00  
				
					
						
							
							
								 
						
							
							
								afed4fb510 
								
							
								 
							
						 
						
							
							
								
								Fix: reading protobuf BoolValues through network used to fail due to problematic dynamic casting  
							
							
							
						 
						
							2016-08-02 14:13:10 +03:00  
				
					
						
							
							
								 
						
							
							
								aea84d0f54 
								
							
								 
							
						 
						
							
							
								
								Add: todo comments  
							
							
							
						 
						
							2016-07-31 17:44:24 +03:00  
				
					
						
							
							
								 
						
							
							
								cb65103fca 
								
							
								 
							
						 
						
							
							
								
								Fix: typo in comment  
							
							
							
						 
						
							2016-07-31 17:43:58 +03:00  
				
					
						
							
							
								 
						
							
							
								ae357541e8 
								
							
								 
							
						 
						
							
							
								
								Fix typo in documentation comment  
							
							
							
						 
						
							2016-07-27 14:25:09 +03:00  
				
					
						
							
							
								 
						
							
							
								da7a05ecd8 
								
							
								 
							
						 
						
							
							
								
								Fix: UI now has command queue of size 1.  
							
							... 
							
							
							
							A new CommandPend class is introduced. It functions basically as
an ArrayBlockingQueue of size 1.
Difference is that it can handle two functions from two different threads
 - trample(cmd): removes the previously kept command (if there is such) and overrides it with the next command
 - offer(cmd): keeps the given command, but only if it doesn't currently keeps an older one
This new functionality is used so the UI can get commands from the controller
(but only take into account the latest one). At the same time it gets tick commands
from its clock ticker, but only keep and handle those if it doesn't have
a real controller command to handle. 
							
						 
						
							2016-07-19 12:05:06 +03:00  
				
					
						
							
							
								 
						
							
							
								1cf16d8386 
								
							
								 
							
						 
						
							
							
								
								Fix: output device now has queue of size 1. a newer command always overrides the previous one  
							
							
							
						 
						
							2016-07-19 11:59:50 +03:00  
				
					
						
							
							
								 
						
							
							
								88991ea9ff 
								
							
								 
							
						 
						
							
							
								
								Refactor: some more comments, and better looking code in VotingBoothImpl.java  
							
							
							
						 
						
							2016-07-12 15:32:22 +03:00  
				
					
						
							
							
								 
						
							
							
								0956fa98d3 
								
							
								 
							
						 
						
							
							
								
								Refactor: add comments to VotingBoothImpl.java, and rename tasks to commands (because they were two names of the same thing)  
							
							... 
							
							
							
							Signed-off-by: Hai Brenner <haibrenner@gmail.com> 
							
						 
						
							2016-07-12 15:23:46 +03:00  
				
					
						
							
							
								 
						
							
							
								42d68b7ce8 
								
							
								 
							
						 
						
							
							
								
								Test: Add NetworkVirtualPrinterTest  
							
							
							
						 
						
							2016-07-12 11:54:50 +03:00  
				
					
						
							
							
								 
						
							
							
								5404bb9ed2 
								
							
								 
							
						 
						
							
							
								
								Fix error in setting name of output device thread  
							
							
							
						 
						
							2016-07-12 11:51:16 +03:00  
				
					
						
							
							
								 
						
							
							
								f2836d277a 
								
							
								 
							
						 
						
							
							
								
								Add polling-station project dependency to VB build.gradle for testing purposes  
							
							
							
						 
						
							2016-07-12 11:50:21 +03:00  
				
					
						
							
							
								 
						
							
							
								b667de95aa 
								
							
								 
							
						 
						
							
							
								
								Fix protobuf definition of EncryptedBallot to match the standard convention.  
							
							
							
						 
						
							2016-07-12 11:49:25 +03:00  
				
					
						
							
							
								 
						
							
							
								49551dc36b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into vbdev2  
							
							... 
							
							
							
							Conflicts:
	meerkat-common/src/main/proto/meerkat/voting.proto 
							
						 
						
							2016-07-06 21:55:34 +03:00  
				
					
						
							
							
								 
						
							
							
								88c4e0e644 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://cs.idc.ac.il/rhodecode/meerkat/meerkat-java  
							
							
							
						 
						
							2016-07-06 21:45:35 +03:00  
				
					
						
							
							
								 
						
							
							
								d804f0dbac 
								
							
								 
							
						 
						
							
							
								
								voting-booth gradle.build now has dependencies on jetty and RESTful API for testing purposes  
							
							
							
						 
						
							2016-07-06 21:33:30 +03:00  
				
					
						
							
							
								 
						
							
							
								b1a033da5e 
								
							
								 
							
						 
						
							
							
								
								Add the channel identifier to the PlaintextBallot, so it is now printed by the output device  
							
							
							
						 
						
							2016-07-06 13:24:10 +03:00  
				
					
						
							
							
								 
						
							
							
								853a6b5684 
								
							
								 
							
						 
						
							
							
								
								Another (final) Generics type fix  
							
							
							
						 
						
							2016-07-04 16:05:52 +03:00  
				
					
						
							
							
								 
						
							
							
								2336d44ffc 
								
							
								 
							
						 
						
							
							
								
								reduced more compilation warnings by having better Generics type handling and better JavaDocs  
							
							
							
						 
						
							2016-07-04 16:04:04 +03:00  
				
					
						
							
							
								 
						
							
							
								d8b766725b 
								
							
								 
							
						 
						
							
							
								
								Removed many compilation warnings by having better handling of Generics types and better JavaDocs  
							
							
							
						 
						
							2016-07-04 15:52:05 +03:00  
				
					
						
							
							
								 
						
							
							
								218677fd96 
								
							
								 
							
						 
						
							
							
								
								added many comments and JavaDocs  
							
							
							
						 
						
							2016-07-04 14:17:11 +03:00  
				
					
						
							
							
								 
						
							
							
								2b56928e9a 
								
							
								 
							
						 
						
							
							
								
								added some JavaDoc comments and documentation  
							
							
							
						 
						
							2016-07-04 11:54:36 +03:00  
				
					
						
							
							
								 
						
							
							
								7db6218735 
								
							
								 
							
						 
						
							
							
								
								fixed: access to the static system messages from the StorageManage class, rather than its instance  
							
							
							
						 
						
							2016-07-04 11:53:28 +03:00  
				
					
						
							
							
								 
						
							
							
								66e5db9f22 
								
							
								 
							
						 
						
							
							
								
								cleared some unnecessary imports  
							
							
							
						 
						
							2016-07-04 11:51:49 +03:00  
				
					
						
							
							
								 
						
							
							
								48bf8dbe6b 
								
							
								 
							
						 
						
							
							
								
								Ignore .arcconfig  
							
							
							
						 
						
							2016-06-28 15:10:38 +03:00  
				
					
						
							
							
								 
						
							
							
								8aada21119 
								
							
								 
							
						 
						
							
							
								
								Fixed some errors in the tests.  
							
							... 
							
							
							
							Made Threaded Client parameterized (with respect to waiting times and thread count). 
							
						 
						
							2016-06-28 15:08:36 +03:00  
				
					
						
							
							
								 
						
							
							
								e298ab1e76 
								
							
								 
							
						 
						
							
							
								
								removed two unnecessary imports  
							
							
							
						 
						
							2016-06-28 11:35:36 +03:00  
				
					
						
							
							
								 
						
							
							
								14fac728b3 
								
							
								 
							
						 
						
							
							
								
								1. ScannedData now has a Channel and a SignedEncryptedBallot attributes,  
							
							... 
							
							
							
							rather than just 'data' attribute
2. Implemented a NetworkVirtualPrinter output device, and now both
   this class and the previous SystemConsoleOutputDevice extend the same
   new abstract class AsyncRunnableOutputDevice which supplies default
   implementations for the interface methods. 
							
						 
						
							2016-06-28 11:32:00 +03:00  
				
					
						
							
							
								 
						
							
							
								3a5908ac49 
								
							
								 
							
						 
						
							
							
								
								A cancel by the voter is now sent to the execution flow as a Throwable  
							
							... 
							
							
							
							rather than an Exception. 
							
						 
						
							2016-06-28 11:28:14 +03:00  
				
					
						
							
							
								 
						
							
							
								438df78e36 
								
							
								 
							
						 
						
							
							
								
								Changed the ToySignature test file to match the new Signature interface.  
							
							
							
						 
						
							2016-06-28 11:26:50 +03:00  
				
					
						
							
							
								 
						
							
							
								4379921445 
								
							
								 
							
						 
						
							
							
								
								For some reason restful API did not appear in my gradle.build. It is fixed now.  
							
							
							
						 
						
							2016-06-28 11:26:00 +03:00  
				
					
						
							
							
								 
						
							
							
								53d609bfee 
								
							
								 
							
						 
						
							
							
								
								Removed database address from Bulletin Board Server init method (the address is given to the Query Provider).  
							
							... 
							
							
							
							Added integration tests for Single Server Bulletin Board Client.
Fixed subscription logic in the Single Server Bulletin Board Client.
Decoupled Single Server- and Simple- Bulletin Board Clients (Simple-... is now obsolete).
Fixed some bugs.
Threaded Bulletin Board Client now has some errors in integration. 
							
						 
						
							2016-06-28 08:19:29 +03:00  
				
					
						
							
							
								 
						
							
							
								d12ad408c4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into vbdev2  
							
							... 
							
							
							
							Conflicts:
	meerkat-common/src/main/proto/meerkat/voting.proto 
							
						 
						
							2016-06-26 17:17:24 +03:00