cwtch.im
/
tapir
5
3
Fork 3
Code Issues 2 Pull Requests Releases 45 Wiki Activity

Formatting + go 1.17 ioutil deprecation

This commit is contained in:
Sarah Jamie Lewis 2022-09-12 19:17:31 -07:00
parent 015307d907
commit 4e4e3b4422
6 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/tokenboard/tokenboard_integration_test.go
View File

@ -10,7 +10,6 @@ import (
"git.openprivacy.ca/openprivacy/connectivity" "git.openprivacy.ca/openprivacy/connectivity"
torProvider "git.openprivacy.ca/openprivacy/connectivity/tor" torProvider "git.openprivacy.ca/openprivacy/connectivity/tor"
"git.openprivacy.ca/openprivacy/log" "git.openprivacy.ca/openprivacy/log"
"io/ioutil"
"os" "os"
"runtime" "runtime"
"sync" "sync"
@ -78,7 +77,7 @@ func TestTokenBoardApp(t *testing.T) {
builder.WithSocksPort(9059).WithControlPort(9060).WithHashedPassword("tapir-integration-test").Build("./tor/torrc") builder.WithSocksPort(9059).WithControlPort(9060).WithHashedPassword("tapir-integration-test").Build("./tor/torrc")
torDataDir := "" torDataDir := ""
var err error var err error
if torDataDir, err = ioutil.TempDir("./tor/", "data-dir-"); err != nil { if torDataDir, err = os.MkdirTemp("./tor/", "data-dir-"); err != nil {
t.Fatalf("could not create data dir") t.Fatalf("could not create data dir")
} }

1
primitives/auditable/auditablestore.go
View File

@ -25,7 +25,6 @@ type State struct {
Messages []Message Messages []Message
} }
//
const ( const (
auditableDataStoreProtocol = "auditable-data-store" auditableDataStoreProtocol = "auditable-data-store"
newMessage = "new-message" newMessage = "new-message"

3
primitives/privacypass/dlogeq.go
View File

@ -16,6 +16,7 @@ type DLEQProof struct {
// DiscreteLogEquivalenceProof constructs a valid DLEQProof for the given parameters and transcript // DiscreteLogEquivalenceProof constructs a valid DLEQProof for the given parameters and transcript
// Given Y = kX & Q = kP // Given Y = kX & Q = kP
// Peggy: t := choose randomly from Zq // Peggy: t := choose randomly from Zq
//
// A := tX // A := tX
// B := tP // B := tP
// c := H(transcript(X,Y,P,Q,A,B)) // c := H(transcript(X,Y,P,Q,A,B))
@ -47,12 +48,14 @@ func DiscreteLogEquivalenceProof(k *ristretto.Scalar, X *ristretto.Element, Y *r
// VerifyDiscreteLogEquivalenceProof verifies the DLEQ for the given parameters and transcript // VerifyDiscreteLogEquivalenceProof verifies the DLEQ for the given parameters and transcript
// Given Y = kX & Q = kP and Proof = (c,s) // Given Y = kX & Q = kP and Proof = (c,s)
// Vicky: X' := sX // Vicky: X' := sX
//
// Y' := cY // Y' := cY
// P' := sP // P' := sP
// Q' := cQ // Q' := cQ
// A' = X'+Y' == sX + cY ?= sG + ckG == (s+ck)X == tX == A // A' = X'+Y' == sX + cY ?= sG + ckG == (s+ck)X == tX == A
// B' = P'+Q' == sP + cQ ?= sP + ckP == (s+ck)P == tP == B // B' = P'+Q' == sP + cQ ?= sP + ckP == (s+ck)P == tP == B
// c' := H(transcript(X,Y,P,Q,A',B')) // c' := H(transcript(X,Y,P,Q,A',B'))
//
// Tests c ?= c // Tests c ?= c
func VerifyDiscreteLogEquivalenceProof(dleq DLEQProof, X *ristretto.Element, Y *ristretto.Element, P *ristretto.Element, Q *ristretto.Element, transcript *core.Transcript) bool { func VerifyDiscreteLogEquivalenceProof(dleq DLEQProof, X *ristretto.Element, Y *ristretto.Element, P *ristretto.Element, Q *ristretto.Element, transcript *core.Transcript) bool {

3
testing/tapir_integration_test.go
View File

@ -9,7 +9,6 @@ import (
torProvider "git.openprivacy.ca/openprivacy/connectivity/tor" torProvider "git.openprivacy.ca/openprivacy/connectivity/tor"
"git.openprivacy.ca/openprivacy/log" "git.openprivacy.ca/openprivacy/log"
"golang.org/x/crypto/ed25519" "golang.org/x/crypto/ed25519"
"io/ioutil"
"os" "os"
"runtime" "runtime"
"runtime/pprof" "runtime/pprof"
@ -69,7 +68,7 @@ func TestTapir(t *testing.T) {
torDataDir := "" torDataDir := ""
var err error var err error
if torDataDir, err = ioutil.TempDir("./tor/", "data-dir-"); err != nil { if torDataDir, err = os.MkdirTemp("./tor/", "data-dir-"); err != nil {
t.Fatalf("could not create data dir") t.Fatalf("could not create data dir")
} }

3
testing/tapir_malicious_remote_integration_test.go
View File

@ -8,7 +8,6 @@ import (
torProvider "git.openprivacy.ca/openprivacy/connectivity/tor" torProvider "git.openprivacy.ca/openprivacy/connectivity/tor"
"git.openprivacy.ca/openprivacy/log" "git.openprivacy.ca/openprivacy/log"
"golang.org/x/crypto/ed25519" "golang.org/x/crypto/ed25519"
"io/ioutil"
"os" "os"
"runtime" "runtime"
"sync" "sync"
@ -30,7 +29,7 @@ func TestTapirMaliciousRemote(t *testing.T) {
torDataDir := "" torDataDir := ""
var err error var err error
if torDataDir, err = ioutil.TempDir("./tor/", "data-dir-"); err != nil { if torDataDir, err = os.MkdirTemp("./tor/", "data-dir-"); err != nil {
t.Fatalf("could not create data dir") t.Fatalf("could not create data dir")
} }