Skip to content

Commit

Permalink
Merge pull request #638 from mohamedasaker-arm/release-candidate-prep…
Browse files Browse the repository at this point in the history
…-1.1.0-rc2

Release candidate prep 1.1.0 rc2
  • Loading branch information
mohamedasaker-arm authored Sep 13, 2022
2 parents 36e4eb9 + ae2bdc9 commit 896dab9
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 38 deletions.
59 changes: 27 additions & 32 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ name = "parsec"
path = "src/bin/main.rs"

[dependencies]
parsec-interface = { git = "https://github.com/parallaxsecond/parsec-interface-rs.git", rev = "b2a4b6656f693b61f7fdac593de5fbbb1853d58e" }
parsec-interface = "0.27.0"
rand = { version = "0.8.3", features = ["small_rng"], optional = true }
base64 = "0.13.0"
uuid = "0.8.2"
Expand All @@ -29,7 +29,7 @@ log = { version = "0.4.14", features = ["serde"] }
cryptoki = { version = "0.3.0", optional = true, features = ["psa-crypto-conversions"] }
picky-asn1-der = { version = "0.2.4", optional = true }
picky-asn1 = { version = "0.3.0", optional = true }
tss-esapi = { git = "https://github.com/parallaxsecond/rust-tss-esapi.git", rev = "b62029d36bac27761e166ab8e063573ef8005adf", optional = true }
tss-esapi = { version = "7.1.0", optional = true }
bincode = "1.3.1"
structopt = "0.3.21"
derivative = "2.2.0"
Expand Down
4 changes: 2 additions & 2 deletions e2e_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ publish = false

[dependencies]
serde = { version = "1.0.123", features = ["derive"] }
parsec-client = { git = "https://github.com/parallaxsecond/parsec-client-rust", rev = "fd083591923c4aeab2bb3eb9c5d0be3c3b48bd37", features = ["testing", "spiffe-auth"] }
parsec-client = { version = "0.14.1", features = ["testing", "spiffe-auth"] }
log = "0.4.14"
# Compatible version with crate rsa
rand = "0.7.3"
env_logger = "0.8.3"
stdext = "0.3.1"
tss-esapi = { git = "https://github.com/parallaxsecond/rust-tss-esapi.git", rev = "62fb9b7b05b1e607518ae127406f3b85991205b9", optional = true }
tss-esapi = { version = "7.1.0", optional = true }

[dev-dependencies]
ring = "0.16.20"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ mod activate_credential {
panic!("Wrong Public type");
};
let pub_handle = basic_ctx
.load_external_public(&key_pub, Hierarchy::Owner)
.load_external_public(key_pub, Hierarchy::Owner)
.unwrap();

let (cred, secret) = basic_ctx
Expand Down
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ lazy_static = "1.4.0"
arbitrary = { version = "0.4.0", features = ["derive"] }

[build-dependencies]
parsec-client = { git = "https://github.com/parallaxsecond/parsec-client-rust", rev = "9e7dd111e77afa9168c1bff84963125057568b6f", features = ["testing", "spiffe-auth"] }
parsec-client = { version = "0.14.1", features = ["testing", "spiffe-auth"] }

# Prevent this from interfering with workspaces
[workspace]
Expand Down

0 comments on commit 896dab9

Please sign in to comment.