Skip to content

Commit

Permalink
Pin deps (#305)
Browse files Browse the repository at this point in the history 
* pin tlsn-utils dep, hyper, and bump mpz

* fix missing pin
  • Loading branch information
@sinui0
sinui0 authored Aug 22, 2023
1 parent 5b26203 commit aaea854
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 44 deletions.
8 changes: 4 additions & 4 deletions components/actors/actor-ot/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
mpz-ot-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" }
mpz-ot-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" }
async-trait = "0.1"
derive_builder = "0.11"
futures = "0.3"
Expand Down
15 changes: 10 additions & 5 deletions components/aead/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,20 @@ name = "aead"
[features]
default = ["mock"]
mock = []
tracing = ["dep:tracing", "tlsn-block-cipher/tracing", "tlsn-stream-cipher/tracing", "tlsn-universal-hash/tracing"]
tracing = [
"dep:tracing",
"tlsn-block-cipher/tracing",
"tlsn-stream-cipher/tracing",
"tlsn-universal-hash/tracing",
]

[dependencies]
tlsn-block-cipher = { path = "../cipher/block-cipher" }
tlsn-stream-cipher = { path = "../cipher/stream-cipher" }
tlsn-universal-hash = { path = "../universal-hash" }
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" }
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" }

async-trait = "0.1"
derive_builder = "0.12"
Expand All @@ -32,5 +37,5 @@ serde = "1"
tracing = { version = "0.1", optional = true }

[dev-dependencies]
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"]}
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
aes-gcm = "0.10"
6 changes: 3 additions & 3 deletions components/cipher/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ resolver = "2"

[workspace.dependencies]
# tlsn
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils" }
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" }

# crypto
aes = "0.8"
Expand Down
6 changes: 3 additions & 3 deletions components/integration-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ edition = "2021"


[dev-dependencies]
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
tlsn-block-cipher = { path = "../cipher/block-cipher" }
tlsn-stream-cipher = { path = "../cipher/stream-cipher" }
tlsn-universal-hash = { path = "../universal-hash" }
tlsn-aead = { path = "../aead" }
tlsn-key-exchange = { path = "../key-exchange" }
tlsn-point-addition = { path = "../point-addition" }
tlsn-hmac-sha256 = { path = "../prf/hmac-sha256" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" }

actor-ot = { path = "../actors/actor-ot" }
uid-mux = { path = "../uid-mux" }
Expand Down
10 changes: 5 additions & 5 deletions components/key-exchange/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ tracing = ["dep:tracing", "tlsn-point-addition/tracing"]
mock = []

[dependencies]
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" }
mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" }
mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
tlsn-point-addition = { path = "../point-addition" }
p256 = { version = "0.13", features = ["ecdh"] }
async-trait = "0.1"
Expand Down
6 changes: 3 additions & 3 deletions components/point-addition/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ mock = ["dep:mpz-core"]
tracing = ["dep:tracing"]

[dependencies]
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687", optional = true }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5", optional = true }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
p256 = { version = "0.13", features = ["arithmetic"] }
tracing = { version = "0.1", optional = true }
async-trait = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions components/prf/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ resolver = "2"

[workspace.dependencies]
# tlsn
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }

# async
async-trait = "0.1"
Expand Down
21 changes: 16 additions & 5 deletions components/tls/tls-mpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,26 @@ edition = "2021"
name = "tls_mpc"

[features]
tracing = ["dep:tracing", "tlsn-block-cipher/tracing", "tlsn-stream-cipher/tracing", "tlsn-universal-hash/tracing", "tlsn-aead/tracing", "tlsn-key-exchange/tracing", "tlsn-point-addition/tracing", "tlsn-hmac-sha256/tracing", "tlsn-tls-client-async/tracing", "uid-mux/tracing"]
tracing = [
"dep:tracing",
"tlsn-block-cipher/tracing",
"tlsn-stream-cipher/tracing",
"tlsn-universal-hash/tracing",
"tlsn-aead/tracing",
"tlsn-key-exchange/tracing",
"tlsn-point-addition/tracing",
"tlsn-hmac-sha256/tracing",
"tlsn-tls-client-async/tracing",
"uid-mux/tracing",
]

[dependencies]
tlsn-tls-core = { path = "../tls-core", features = ["serde"] }
tlsn-tls-backend = { path = "../tls-backend" }

mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }

tlsn-block-cipher = { path = "../../cipher/block-cipher" }
tlsn-stream-cipher = { path = "../../cipher/stream-cipher" }
Expand All @@ -30,7 +41,7 @@ tlsn-key-exchange = { path = "../../key-exchange" }
tlsn-point-addition = { path = "../../point-addition" }
tlsn-hmac-sha256 = { path = "../../prf/hmac-sha256" }

tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" }

p256.workspace = true
rand.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions components/uid-mux/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition = "2021"
tracing = ["dep:tracing"]

[dependencies]
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" }

async-trait = "0.1"
futures = "0.3"
Expand All @@ -25,5 +25,5 @@ tokio = { version = "1", features = [
"macros",
"rt",
"rt-multi-thread",
"time"
"time",
] }
6 changes: 3 additions & 3 deletions components/universal-hash/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ mock = []

[dependencies]
# tlsn
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }

# async
async-trait = "0.1"
Expand Down
18 changes: 9 additions & 9 deletions tlsn/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ members = [
"tlsn-notary",
"tlsn-prover",
"tests-integration",
"examples",
"examples",
]
resolver = "2"

Expand All @@ -21,19 +21,19 @@ tls-server-fixture = { path = "../components/tls/tls-server-fixture" }
actor-ot = { path = "../components/actors/actor-ot" }
uid-mux = { path = "../components/uid-mux" }

tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" }
tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" }

mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-garble-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" }
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-garble-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" }


futures = "0.3"
tokio-util = "0.7"
hyper = "0.14"
hyper = "<=0.14.26"
tokio = "1"

signature = "2"
Expand Down

0 comments on commit aaea854

Please sign in to comment.