Skip to content

Commit 3060fd2

Browse files
bors[bot]Adrian Cruceru
andauthored
Merge #326
326: Acruceru/workflows r=[aandyl] a=AdrianCX It's easier to review commit-by-commit. Update to client libraries to interact with new apis. Co-authored-by: Adrian Cruceru <adrian.cruceru@fortanix.com>
2 parents dbf2bdb + de26998 commit 3060fd2

File tree

26 files changed

+1844
-1680
lines changed

26 files changed

+1844
-1680
lines changed

em-app/Cargo.lock

Lines changed: 303 additions & 230 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

em-app/Cargo.toml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[package]
44
name = "em-app"
5-
version = "0.2.0"
5+
version = "0.3.0"
66
authors = ["fortanix.com"]
77
license = "MPL-2.0"
88
edition = "2018"
@@ -13,12 +13,24 @@ keywords = [ "sgx" ]
1313

1414
[dependencies]
1515
hyper = { version = "0.10", default-features = false }
16-
mbedtls = { version = "0.7", default-features = false, features = ["sgx"] }
16+
mbedtls = { version = "0.8.1", features = [ "rdrand" ] }
1717
b64-ct = "0.1.0"
18+
serde = "1.0.123"
19+
serde_derive = "1.0.123"
1820
serde_bytes = "0.10"
1921
serde_json = "1.0"
2022
sgx-isa = { version="0.3", features=["sgxstd"], default-features=false }
23+
rustc-serialize = { git = "https://github.com/jethrogb/rustc-serialize.git", branch = "portability" }
2124

25+
em-client = { git = "https://github.com/fortanix/em-client-rust", branch = "acruceru/api-update", default-features = false, features = ["client"] }
2226
em-node-agent-client = "1.0.0"
2327
sgx_pkix = "0.1.0"
2428
pkix = "0.1.1"
29+
30+
sdkms = { git = "https://github.com/fortanix/sdkms-client-rust.git", branch = "uuid-compat", default-features = false }
31+
uuid = { version = "0.6.3", features = ["v4", "serde"] }
32+
33+
url = "1"
34+
35+
[patch.crates-io]
36+
rustc-serialize = { git = "https://github.com/jethrogb/rustc-serialize.git", branch = "portability" }

em-app/examples/client/.cargo/config

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)