Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Support external_ballot_identifer as a string #71

Merged
merged 31 commits into from
Jan 28, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8071d5a
Support external_ballot_identifer as a string. Export/import ballots…
AddressXception Jan 23, 2020
9547fa6
Remove Simple Example, add api doc stubs
AddressXception Jan 24, 2020
35b58bb
Merge remote-tracking branch 'origin/master' into feature/ballot-iden…
AddressXception Jan 24, 2020
f5d5c63
Fix Merge Issue
AddressXception Jan 24, 2020
04ac827
Verify malloc success
AddressXception Jan 24, 2020
fcdd4b4
Address PR Feedback
AddressXception Jan 24, 2020
e7d4f8b
Fix LGTM alerts
AddressXception Jan 24, 2020
0b7ebb9
Add soft delete of encrypter files
AddressXception Jan 24, 2020
8bed2cf
Free CP Proof
AddressXception Jan 24, 2020
5e049e6
Fix windows Makefile
AddressXception Jan 24, 2020
a42239a
test fix pr workflow on windows
AddressXception Jan 24, 2020
6c4b75f
Merge remote-tracking branch 'origin/master' into feature/ballot-iden…
AddressXception Jan 24, 2020
c28a997
use secure api's
AddressXception Jan 24, 2020
6aeca9c
explicitly compile release
AddressXception Jan 24, 2020
2df4152
flush file write before read
AddressXception Jan 24, 2020
b4cd351
clean up makefile
AddressXception Jan 24, 2020
349a75f
Document consumers resonsible for free
AddressXception Jan 27, 2020
daec352
Rename static coordinators in API to differentiate local vars
AddressXception Jan 27, 2020
4a24656
add new enum cases to the end on voting coordinator
AddressXception Jan 27, 2020
190dfd2
Add convenience logging
AddressXception Jan 27, 2020
818f8a9
Handle error cases on file access
AddressXception Jan 27, 2020
67ea359
use consistent file formatting when rebuilding tracker string
AddressXception Jan 27, 2020
aef1521
optimize null check
AddressXception Jan 27, 2020
13a191b
explicitly set tracker array positions to NULL on failure
AddressXception Jan 27, 2020
54b5b80
Reformat refactor Decryption_Coordinator_receive_share
AddressXception Jan 27, 2020
dd567e2
guard tallies_initialized when freeing resources
AddressXception Jan 27, 2020
707ddbe
rename _encrypted_ballot_count
AddressXception Jan 27, 2020
ab0ba22
don't return early
AddressXception Jan 27, 2020
9f6fc27
do not fail soft delete if rename fails
AddressXception Jan 27, 2020
7a6a588
fix assignment
AddressXception Jan 27, 2020
bc26137
adjust number of ballots to force a rebuild
AddressXception Jan 28, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,7 @@ _deps
ElectionGuardConfig.cmake
*_build/
ballots/

ballots_encrypter/

tallies/
10 changes: 7 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ add_library(electionguard
${PROJECT_SOURCE_DIR}/src/electionguard/api/filename.c
${PROJECT_SOURCE_DIR}/src/electionguard/api/create_election.c
${PROJECT_SOURCE_DIR}/src/electionguard/api/encrypt_ballot.c
${PROJECT_SOURCE_DIR}/src/electionguard/api/load_ballots.c
${PROJECT_SOURCE_DIR}/src/electionguard/api/record_ballots.c
${PROJECT_SOURCE_DIR}/src/electionguard/api/tally_votes.c
${PROJECT_SOURCE_DIR}/src/electionguard/crypto_reps.h
${PROJECT_SOURCE_DIR}/src/electionguard/voting/ballot_collection.c
${PROJECT_SOURCE_DIR}/src/electionguard/voting/coordinator.c
${PROJECT_SOURCE_DIR}/src/electionguard/voting/num_ballots.h
${PROJECT_SOURCE_DIR}/src/electionguard/voting/messages.c
${PROJECT_SOURCE_DIR}/src/electionguard/voting/message_reps.h
${PROJECT_SOURCE_DIR}/src/electionguard/voting/nouns.c
${PROJECT_SOURCE_DIR}/src/electionguard/voting/tracker.c
Expand Down Expand Up @@ -65,9 +67,11 @@ add_library(electionguard
${PROJECT_SOURCE_DIR}/src/electionguard/file.c
${PROJECT_SOURCE_DIR}/src/electionguard/directory.c
${PROJECT_SOURCE_DIR}/src/electionguard/directory.h
${PROJECT_SOURCE_DIR}/src/electionguard/uthash.h
${PROJECT_SOURCE_DIR}/include/electionguard/api/config.h
${PROJECT_SOURCE_DIR}/include/electionguard/api/create_election.h
${PROJECT_SOURCE_DIR}/include/electionguard/api/encrypt_ballot.h
${PROJECT_SOURCE_DIR}/include/electionguard/api/load_ballots.h
${PROJECT_SOURCE_DIR}/include/electionguard/api/record_ballots.h
${PROJECT_SOURCE_DIR}/include/electionguard/api/tally_votes.h
${PROJECT_SOURCE_DIR}/include/electionguard/file.h
Expand Down Expand Up @@ -109,8 +113,8 @@ if (MINGW)
set_target_properties(electionguard PROPERTIES PREFIX "")
endif()

# Set the public include directory depending on if the target is being exported
# or installed
# Set the public include directory depending on
# if the target is being exported or installed
target_include_directories(electionguard
SYSTEM PUBLIC
$<INSTALL_INTERFACE:include>
Expand Down
2 changes: 0 additions & 2 deletions examples/api/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ add_executable(api
${PROJECT_SOURCE_DIR}/main.c
)


find_package(ElectionGuard REQUIRED)

find_package(GMP REQUIRED)
Expand All @@ -31,7 +30,6 @@ else()
target_link_libraries(api electionguard gmp)
endif()


if (WIN32)
target_link_libraries(api Bcrypt)
endif (WIN32)
Expand Down
Loading