diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index d112f6b..74c4256 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -30,7 +30,7 @@ jobs: - name: Install internal dependencies run: | - export INTERNAL_GIT_VERSION="master" + export INTERNAL_GIT_VERSION="10.0.0" git clone https://github.com/sequentech/tally-methods.git cd tally-methods && git checkout "${INTERNAL_GIT_VERSION}" && cd .. mv tally-methods/tally_methods . diff --git a/README.md b/README.md index 1bab80c..6971ff8 100644 --- a/README.md +++ b/README.md @@ -122,11 +122,11 @@ appropiate version to use in your case. > :warning: **Note** You need to change the `INTERNAL_GIT_VERSION` you should be using depending on the version of [Sequent] platform used to run the election you -want to verify. In this example, we're using version `5.0.0` of [Sequent] +want to verify. In this example, we're using version `10.0.0` of [Sequent] platform. ```bash -export INTERNAL_GIT_VERSION="5.0.0" +export INTERNAL_GIT_VERSION="10.0.0" git clone https://github.com/sequentech/election-verifier.git cd election-verifier git checkout "${INTERNAL_GIT_VERSION}" diff --git a/build.sbt b/build.sbt index dab8e4f..11bd0a7 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ name := "election-verifier" -version := "master" +version := "10.0.0" scalaVersion := "2.10.3" diff --git a/package.sh b/package.sh index 520e38a..a8db000 100755 --- a/package.sh +++ b/package.sh @@ -19,7 +19,7 @@ rm -r -f dist mkdir dist cp -r tally_methods dist cp -r tally_pipes dist -cp target/scala-2.10/proguard/election-verifier_2.10-master.jar dist +cp target/scala-2.10/proguard/election-verifier_2.10-10.0.0.jar dist cp pverify.sh dist cp vmnc.sh dist cp verify.py dist diff --git a/project.spdx.yml b/project.spdx.yml index 4244d6d..2380aa9 100644 --- a/project.spdx.yml +++ b/project.spdx.yml @@ -6,7 +6,7 @@ creationInfo: - "Organization: Sequent Tech Inc." - "Person: Eduardo Robles" licenseListVersion: "3.9" -name: "election-verifier-master" +name: "election-verifier-10.0.0" dataLicense: "CC0-1.0" documentNamespace: "http://sequentech.io/spdxdocs/spdx-document-election-verifier-0d6261e7-2d52-4eb7-9d3d-2091a35978ab" documentDescribes: @@ -15,13 +15,13 @@ packages: - SPDXID: "SPDXRef-Package-election-verifier" summary: "election-verifier performs tally and cryptographic verification of the election process, including key generation, shuffling and joint-decryption." copyrightText: "Copyright 2015-2021 Sequent Tech Inc and others" - downloadLocation: "git+https://github.com/sequentech/election-verifier.git@master" + downloadLocation: "git+https://github.com/sequentech/election-verifier.git@10.0.0" filesAnalyzed: false homepage: "https://github.com/sequentech/election-verifier" licenseConcluded: "NOASSERTION" licenseDeclared: "AGPL-3.0-only" name: "election-verifier" - versionInfo: "master" + versionInfo: "10.0.0" - SPDXID: "SPDXRef-Package-tally-methods" description: "sequent base tallying system." copyrightText: "Copyright 2014 - 2021 Sequent Tech Inc and others" diff --git a/pverify.sh b/pverify.sh index fc970a9..4d4bcd5 100755 --- a/pverify.sh +++ b/pverify.sh @@ -22,5 +22,5 @@ fi command -v java >/dev/null 2>&1 || { echo >&2 "* I require java but it's not installed. Aborting."; exit 1; } -java -Djava.security.egd=file:/dev/./urandom -classpath election-verifier_2.10-master.jar org.sequent.sequent.Verifier $1 $2 +java -Djava.security.egd=file:/dev/./urandom -classpath election-verifier_2.10-10.0.0.jar org.sequent.sequent.Verifier $1 $2 exit $? diff --git a/testdata/8.tar b/testdata/8.tar index ae8f9d8..d072832 100644 Binary files a/testdata/8.tar and b/testdata/8.tar differ diff --git a/testdata/8_wrong_ballots.tar b/testdata/8_wrong_ballots.tar index a4986fd..e38e19b 100644 Binary files a/testdata/8_wrong_ballots.tar and b/testdata/8_wrong_ballots.tar differ diff --git a/testdata/8_wrong_proof_of_shuffle.tar b/testdata/8_wrong_proof_of_shuffle.tar index 331c2d9..887aba7 100644 Binary files a/testdata/8_wrong_proof_of_shuffle.tar and b/testdata/8_wrong_proof_of_shuffle.tar differ diff --git a/testdata/8_wrong_results.tar b/testdata/8_wrong_results.tar index e13987c..06e23b2 100644 Binary files a/testdata/8_wrong_results.tar and b/testdata/8_wrong_results.tar differ diff --git a/vmnc.sh b/vmnc.sh index d8caf2e..f69faf1 100755 --- a/vmnc.sh +++ b/vmnc.sh @@ -19,4 +19,4 @@ command -v java >/dev/null 2>&1 || { echo >&2 "* I require java but it's not ins DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -java -Djava.security.egd=file:/dev/./urandom -classpath $DIR/election-verifier_2.10-master.jar org.sequent.sequent.Vmnc "$@" +java -Djava.security.egd=file:/dev/./urandom -classpath $DIR/election-verifier_2.10-10.0.0.jar org.sequent.sequent.Vmnc "$@"