c0ed5ea3fc 
								
							
								 
							
						 
						
							
							
								
								Added the configuration object that will contains all needed data for  
							
							... 
							
							
							
							voting booth initilization 
							
						 
						
							2016-10-01 15:41:13 +03:00  
				
					
						
							
							
								 
						
							
							
								267164e996 
								
							
								 
							
						 
						
							
							
								
								Update to Gradle 3.1  
							
							
							
						 
						
							2016-09-21 16:19:45 +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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								d1f7413cde 
								
							
								 
							
						 
						
							
							
								
								Working client-side Batch changes  
							
							
							
						 
						
							2016-06-26 13:06:16 +03:00  
				
					
						
							
							
								 
						
							
							
								2bdf92b075 
								
							
								 
							
						 
						
							
							
								
								Fixed some stuff according to Arbel's suggestions.  
							
							... 
							
							
							
							Specifically:
1. now handling exceptions in the encryption process (according to voter's choice)
2. handling files in storage manager (now reading election parameters and system messages from files)
3. Controller's init() now already sets all the info and parameters. No need to call extra functions
4. some more changes to the method structure 
							
						 
						
							2016-06-20 15:26:53 +03:00  
				
					
						
							
							
								 
						
							
							
								1951db546d 
								
							
								 
							
						 
						
							
							
								
								Changed Bulletin Board Message payload to either data or message ID  
							
							... 
							
							
							
							Added server-generated unique batch identifiers
Changed Client-side interfaces
Refactored Client-side code for new batch mechanisms
Not tested on client-side yet 
							
						 
						
							2016-06-19 22:00:43 +03:00  
				
					
						
							
							
								 
						
							
							
								b501992643 
								
							
								 
							
						 
						
							
							
								
								Complete overhaul of batch system on server-side  
							
							... 
							
							
							
							Added batch methods to BulletinBoardUtils
Related changes in BulletinBoardDigest and BulletinBoardSignature
Merge remote-tracking branch 'origin/master' into Cached-Client
Conflicts:
	bulletin-board-client/src/main/java/meerkat/bulletinboard/SimpleBulletinBoardClient.java
	bulletin-board-client/src/main/java/meerkat/bulletinboard/ThreadedBulletinBoardClient.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/BulletinBoardSQLServer.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/H2QueryProvider.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/MySQLQueryProvider.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/webapp/BulletinBoardWebApp.java
	bulletin-board-server/src/main/proto/meerkat/bulletin_board_server.proto
	meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardClient.java
	meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardServer.java 
							
						 
						
							2016-06-16 11:21:58 +03:00  
				
					
						
							
							
								 
						
							
							
								13f8948cfb 
								
							
								 
							
						 
						
							
							
								
								change the output class to run as a thread.  
							
							... 
							
							
							
							It is now runnable and has its own queue of (also new) OutputCommands, and its own shutdown flag. 
							
						 
						
							2016-06-15 19:32:05 +03:00  
				
					
						
							
							
								 
						
							
							
								337a135151 
								
							
								 
							
						 
						
							
							
								
								Started removing dependency on CompleteBatch.  
							
							... 
							
							
							
							Tags of batches are now stored as a blob until the batch is complete. 
							
						 
						
							2016-06-15 10:34:46 +03:00  
				
					
						
							
							
								 
						
							
							
								76d3fdeac2 
								
							
								 
							
						 
						
							
							
								
								Fixed the Selector classes.  
							
							... 
							
							
							
							Fixed the crypto classes to handle signatures as well.
Some more other fixes 
							
						 
						
							2016-06-07 16:15:08 +03:00  
				
					
						
							
							
								 
						
							
							
								ffac7c1e34 
								
							
								 
							
						 
						
							
							
								
								Fixed all of Tal's remarks.  
							
							... 
							
							
							
							Switched to using the predefined BoolValue Protobuf. 
							
						 
						
							2016-06-02 14:48:48 +03:00  
				
					
						
							
							
								 
						
							
							
								7c60e487cc 
								
							
								 
							
						 
						
							
							
								
								Created a test for the Synchronizer.  
							
							... 
							
							
							
							Not passing yet. 
							
						 
						
							2016-06-01 21:34:17 +03:00  
				
					
						
							
							
								 
						
							
							
								347e826f73 
								
							
								 
							
						 
						
							
							
								
								Working integrated version of Scanner WebApp  
							
							... 
							
							
							
							Fully testsed
Moved BoolMsg and IntMsg to Comm package (from BulletinBoardAPI) 
							
						 
						
							2016-05-31 15:26:56 +03:00  
				
					
						
							
							
								 
						
							
							
								061dc69fbc 
								
							
								 
							
						 
						
							
							
								
								File rename  
							
							
							
						 
						
							2016-05-05 17:01:00 +03:00  
				
					
						
							
							
								 
						
							
							
								b934894bc5 
								
							
								 
							
						 
						
							
							
								
								Created Polling Station Scanner interface  
							
							... 
							
							
							
							Implemented Web App for the scanner
Not tested 
							
						 
						
							2016-05-05 16:55:10 +03:00  
				
					
						
							
							
								 
						
							
							
								c04ed42dca 
								
							
								 
							
						 
						
							
							
								
								possible future protobufs for handling category channel selection.  
							
							... 
							
							
							
							Summary:
The initial code for the voting booth.
Some things are still missing:
1. comments EVERYWHERE
2. an implementation for the encryptor (program crashes when trying to encrypt PlaintexBallot)
3. the OutputDevice class should become a thread, (runnable with a queue of commands as the UI component)
Test Plan: Currently only simply run it with another main class.
Reviewers: arbel.peled
Differential Revision: https://proj-cs.idc.ac.il/D3  
							
						 
						
							2016-05-04 17:58:06 +03:00  
				
					
						
							
							
								 
						
							
							
								e677355040 
								
							
								 
							
						 
						
							
							
								
								comments:  
							
							
							
						 
						
							2016-04-17 09:09:13 +03:00  
				
					
						
							
							
								 
						
							
							
								4c33e923b2 
								
							
								 
							
						 
						
							
							
								
								Implemented Synchronizer and Cached Client  
							
							... 
							
							
							
							Not tested yet 
							
						 
						
							2016-04-16 19:50:09 +03:00  
				
					
						
							
							
								 
						
							
							
								9ed728fca7 
								
							
								 
							
						 
						
							
							
								
								Added message counting ability to the server (but not to the client)  
							
							... 
							
							
							
							Added synchronous CompleteBatch read by the client
Started implementing the synchronizer
Added support for null callbacks 
							
						 
						
							2016-04-14 09:20:11 +03:00  
				
					
						
							
							
								 
						
							
							
								1f8df95895 
								
							
								 
							
						 
						
							
							
								
								More refactoring for tests and protocol -- user class now handles all messages synchronously (in the main thread); concurrency is now simpler)  
							
							
							
						 
						
							2016-04-14 03:34:54 +03:00  
				
					
						
							
							
								 
						
							
							
								48b2b9efa2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Cached-Client' of  https://cs.idc.ac.il/rhodecode/meerkat/meerkat-java  into Cached-Client  
							
							
							
						 
						
							2016-04-13 10:38:43 +03:00  
				
					
						
							
							
								 
						
							
							
								c806e7b32a 
								
							
								 
							
						 
						
							
							
								
								Added Deletion to Bulletin Board Server and Local Client  
							
							
							
						 
						
							2016-04-13 09:46:24 +03:00  
				
					
						
							
							
								 
						
							
							
								d2373c09f2 
								
							
								 
							
						 
						
							
							
								
								Merge with master  
							
							
							
						 
						
							2016-04-11 20:14:18 +03:00  
				
					
						
							
							
								 
						
							
							
								1ec02173e7 
								
							
								 
							
						 
						
							
							
								
								package renaming and protobuf moves  
							
							
							
						 
						
							2016-04-11 19:48:36 +03:00  
				
					
						
							
							
								 
						
							
							
								e904caa74f 
								
							
								 
							
						 
						
							
							
								
								Added certificates to version control  
							
							
							
						 
						
							2016-04-11 14:21:36 +03:00  
				
					
						
							
							
								 
						
							
							
								07aecd5237 
								
							
								 
							
						 
						
							
							
								
								TimestampComparator name change  
							
							
							
						 
						
							2016-04-11 12:26:02 +03:00  
				
					
						
							
							
								 
						
							
							
								d0951f8644 
								
							
								 
							
						 
						
							
							
								
								stop  
							
							
							
						 
						
							2016-04-08 21:48:08 +03:00  
				
					
						
							
							
								 
						
							
							
								3e1f59ec2b 
								
							
								 
							
						 
						
							
							
								
								switch secret with share  
							
							
							
						 
						
							2016-04-08 15:46:54 +03:00  
				
					
						
							
							
								 
						
							
							
								4f608e813d 
								
							
								 
							
						 
						
							
							
								
								Code review comments and channges  
							
							
							
						 
						
							2016-04-05 15:36:00 +03:00  
				
					
						
							
							
								 
						
							
							
								19e52344f5 
								
							
								 
							
						 
						
							
							
								
								Merged move to public qilin version  
							
							
							
						 
						
							2016-04-05 11:49:34 +03:00  
				
					
						
							
							
								 
						
							
							
								6d6e4748b7 
								
							
								 
							
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2016-04-05 11:32:07 +03:00  
				
					
						
							
							
								 
						
							
							
								e56312d38b 
								
							
								 
							
						 
						
							
							
								
								Local Client supports subsrciptions  
							
							
							
						 
						
							2016-03-22 10:16:46 +02:00  
				
					
						
							
							
								 
						
							
							
								a7699086d8 
								
							
								 
							
						 
						
							
							
								
								Local Client for testing (without subscription yet)  
							
							... 
							
							
							
							Partial implementation of subscriptions.
Some bug fixes. 
							
						 
						
							2016-03-21 20:32:57 +02:00  
				
					
						
							
							
								 
						
							
							
								e27fddcf0c 
								
							
								 
							
						 
						
							
							
								
								mixing test passed  
							
							
							
						 
						
							2016-03-20 19:18:23 +02:00  
				
					
						
							
							
								 
						
							
							
								e4a33af4d4 
								
							
								 
							
						 
						
							
							
								
								abort message  
							
							
							
						 
						
							2016-03-18 14:20:47 +02:00  
				
					
						
							
							
								 
						
							
							
								15453a772d 
								
							
								 
							
						 
						
							
							
								
								Changes made in the initial interfaces for further code review.  
							
							... 
							
							
							
							1. Especially tried to fix the callback mechanism I previously used.
2. 'long sessionID' changed to 'int requestId'
3. Introduced a generic class VotingBoothResult
4. Quite some other local changes 
							
						 
						
							2016-03-02 19:52:17 +02:00  
				
					
						
							
							
								 
						
							
							
								cc7e138a43 
								
							
								 
							
						 
						
							
							
								
								redesigned mail handler  
							
							
							
						 
						
							2016-03-01 16:49:55 +02:00  
				
					
						
							
							
								 
						
							
							
								1cf14a60a8 
								
							
								 
							
						 
						
							
							
								
								Bulletin Board Client support for streaming and Timestamps  
							
							... 
							
							
							
							Created standard Checksum interface and implementation for Sync Query mechanism
Added the Timestamp into the Batch Digest and Signature logic 
							
						 
						
							2016-03-01 13:56:18 +02:00  
				
					
						
							
							
								 
						
							
							
								71191e05b9 
								
							
								 
							
						 
						
							
							
								
								Added Sync Query tests on Bulletin Board Server  
							
							
							
						 
						
							2016-02-29 08:36:35 +02:00  
				
					
						
							
							
								 
						
							
							
								77f47fe9e1 
								
							
								 
							
						 
						
							
							
								
								First version of Voter Booth  
							
							... 
							
							
							
							Summary:
Planned some basic interfaces for my revised Voting Booth componenets.
No implementation yet, though...
Test Plan: There are none, yet
Reviewers: arbel.peled
Differential Revision: https://proj-cs.idc.ac.il/D2  
							
						 
						
							2016-02-28 15:10:27 +02:00  
				
					
						
							
							
								 
						
							
							
								0f7dbe3d50 
								
							
								 
							
						 
						
							
							
								
								SDKG tested for non coruppted parties  
							
							
							
						 
						
							2016-02-23 19:02:49 +02:00  
				
					
						
							
							
								 
						
							
							
								aeb7c13436 
								
							
								 
							
						 
						
							
							
								
								Made read operations stream the results.  
							
							... 
							
							
							
							Removed dependency on large Protobufs (BulletinBoardMessageList and BatchDataList).
Partial implementation of Sync Query.
Current version supports only H2 and MySQL (no SQLite support). 
							
						 
						
							2016-02-22 08:04:01 +02:00  
				
					
						
							
							
								 
						
							
							
								210cc327ac 
								
							
								 
							
						 
						
							
							
								
								secure dkg without stage 4  
							
							
							
						 
						
							2016-02-17 22:58:20 +02:00  
				
					
						
							
							
								 
						
							
							
								9a78330e29 
								
							
								 
							
						 
						
							
							
								
								Working Integration test for Threaded BB Client supporting Batches.  
							
							... 
							
							
							
							Haven't tested subscriptions yet. 
							
						 
						
							2016-02-16 22:33:52 +02:00