fixed API client support and test driver

client/heliosclient.py

@@ -29,7 +29,7 @@ def params(self):
     return algs.ElGamal.fromJSONDict(utils.from_json(params_json))
 
   def election_new(self, name, public_key):
-    election_id = self.post("/elections/new_2", {"name" : name, "public_key" : utils.to_json(public_key.toJSONDict())})
+    election_id = self.post("/elections/new_3", {"name" : name, "public_key" : utils.to_json(public_key.toJSONDict())})
     return election_id
 
   def election_get(self, election_id):
@@ -40,7 +40,7 @@ def election_set_reg(self, election_id, open_reg=False):
     return result == "SUCCESS"
 
   def election_questions_save(self, election_id, questions):
-    result = self.post("/elections/%s/save" % election_id, {'election_json' : utils.to_json({'questions':questions})})
+    result = self.post("/elections/%s/save_questions" % election_id, {'questions_json' : utils.to_json(questions)})
     return result == "SUCCESS"
 
   def election_freeze(self, election_id):

client/oauthclient.py

@@ -28,7 +28,7 @@ def access_resource(self, method, url, parameters):
     if parameters == {}:
       headers['Content-Length'] = 0
 
-    print "headers: " + str(headers)
+    #print "headers: " + str(headers)
 
     connection = httplib.HTTPConnection("%s:%d" % (self.server, self.port))
     connection.request(method, url, headers= headers, body = utils.dictToURLParams(parameters))

crypto/electionalgs.py

@@ -60,9 +60,10 @@ def fromJSONDict(cls, d, pk):
     return ea
 
   @classmethod
-  def fromElectionAndAnswer(cls, election, question_num, answer_index):
+  def fromElectionAndAnswer(cls, election, question_num, answer_indexes):
     """
-    Given an election, a question number, and an answer to that question in the form of a 0-based index into the answer array,
+    Given an election, a question number, and a list of answers to that question
+    in the form of an array of 0-based indexes into the answer array,
     produce an EncryptedAnswer that works.
     """
     question = election.questions[question_num]
@@ -89,7 +90,8 @@ def fromElectionAndAnswer(cls, election, question_num, answer_index):
     for answer_num in range(len(answers)):
       plaintext_index = 0
 
-      if answer_num == answer_index:
+      # assuming a list of answers
+      if answer_num in answer_indexes:
         plaintext_index = 1
         num_selected_answers += 1
 

index.yaml

@@ -10,14 +10,14 @@ indexes:
 # automatically uploaded to the admin console when you next deploy
 # your application using appcfg.py.
 
-# Used once in query history.
+# Used 6 times in query history.
 - kind: ElectionExponent
   properties:
   - name: election
   - name: exponent
     direction: desc
 
-# Used 33 times in query history.
+# Unused in query history -- copied from input.
 - kind: KeyShare
   properties:
   - name: election
@@ -43,7 +43,7 @@ indexes:
   - name: tallied_at
   - name: cast_id
 
-# Used 24 times in query history.
+# Unused in query history -- copied from input.
 - kind: Voter
   properties:
   - name: election

static/docs/verification-specs.html

@@ -351,7 +351,7 @@ <h2>Verifying a Single Ballot</h2>
     return False
 
 # the overall challenge
-computed_challenge = sum([proof.challenge for proof in disjunctive_proof]) % public_key.p
+computed_challenge = sum([proof.challenge for proof in disjunctive_proof]) % public_key.q
 
 # concatenate the arrays of A,B values
 list_of_values_to_hash = sum([[p.commitment.A, p.commitment.B] for p in disjunctive_proof], [])

tests/heliosclient.py

@@ -14,7 +14,7 @@
 
 # instantiate the client
 # modify variables here
-helios = heliosclient.HeliosClient({'consumer_key': 'votehere', 'consumer_secret': 'votehere',
+helios = heliosclient.HeliosClient({'consumer_key': 'test', 'consumer_secret': 'test',
                         'access_token': '123', 'access_token_secret' : '123'},
                         host = 'localhost',
                         port = 8082)
@@ -47,9 +47,9 @@
 print "election hash is %s" % election.hash
 
 # create three ballots
-ballot_1 = electionalgs.EncryptedVote.fromElectionAndAnswers(election, [1])
-ballot_2 = electionalgs.EncryptedVote.fromElectionAndAnswers(election, [1])
-ballot_3 = electionalgs.EncryptedVote.fromElectionAndAnswers(election, [0])
+ballot_1 = electionalgs.EncryptedVote.fromElectionAndAnswers(election, [[1]])
+ballot_2 = electionalgs.EncryptedVote.fromElectionAndAnswers(election, [[1]])
+ballot_3 = electionalgs.EncryptedVote.fromElectionAndAnswers(election, [[0]])
 
 print "created 3 ballots"