68e1737f22
Dependency cleaning; more spongification; use composite build to include qilin (need qilin 1.3+ now)
2017-06-26 01:59:32 +03:00
3c52eb2e8d
Done refactoring scannerAPI; fixed android scanner to use modern settings api and allow URL+nonce
2017-06-26 00:22:20 +03:00
0dfd2480d2
Added connection to android scanner; problems with missing crypto providers
2017-06-25 19:27:38 +03:00
6f35f105c5
Mostly finished with scanAPI refactoring
2017-06-25 16:20:28 +03:00
7e4260b8d5
Added signature key generation to crypto API
2017-06-24 03:15:59 +03:00
ceba09e65c
working on scanner API refactoring (doesn't compile yet)
2017-06-22 17:56:59 +03:00
24e3556320
fixed build so android-scanner compiles; changed android-scanner to use meerkat scanner API rather than custom REST library
2017-06-22 02:58:01 +03:00
17d7d5eca4
Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui
2017-01-25 21:45:50 +02:00
b360ae81bb
Fix gradle build files to work without nexus repository credentials
2017-01-25 19:10:18 +02:00
06526a16db
Clean up build files and remove dependency on local nexus repository
2017-01-24 17:17:09 +02:00
53cc13b51b
Cleaning up unchecked casts
2017-01-24 16:28:57 +02:00
ce0e0e0d62
Fix protobuf decoding bug
2017-01-23 15:41:27 +02:00
43d4fb75b2
More refactoring, wrote command-line mixer application (no BB access as of yet)
2017-01-21 21:42:10 +02:00
b9abd847c7
Refactoring
2017-01-19 16:00:01 +02:00
fc2c26d7e9
Refactoring (tests currently fail)
2017-01-19 11:08:07 +02:00
a5cceaa6c0
Writing tests for new ZKPs
2017-01-12 11:05:38 +02:00
b7ef2c10e1
rewriting mixing proofs
2017-01-11 17:01:14 +02:00
d6ea9412e3
Changed the usage of json configuration
...
For now we use an binary file which contains all the protobuf ballot
quesitons.
However there is a problem, the jar that suppose to convert json into
binary configuraiton file doesnt work.
2016-11-05 18:00:28 +02:00
aac7a50a94
Yet more mixer refactoring
2016-11-02 11:59:20 +02:00
c5dcb9f06e
Added the description of the picture of the candidate
2016-10-29 09:48:29 +03:00
fe5a4d7be1
Created Succesefully whole config object
2016-10-02 22:26:38 +03:00
ef1ff8dea1
Creating configuration file
2016-10-02 21:35:59 +03:00
68291d34f3
Added the protobuf that describes the voting booth question
...
And changed the panels to work with voting booth configuration object
instead of the backend.
2016-10-01 18:50:33 +03:00
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
Tal Moran
Laura Radaelli
VladimirEliTokarev
Hai Brenner
arbel.peled
tzlil.gon