Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to mbedtls v0.13.0 #658

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to mbedtls v0.13.0 #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
281 changes: 155 additions & 126 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions em-app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ b64-ct = "0.1.0"
em-client = { version = "4.0.0", default-features = false, features = ["client"] }
em-node-agent-client = "1.0.0"
hyper = { version = "0.10", default-features = false }
mbedtls = { version = "0.12", default-features = false, features = ["rdrand", "std", "ssl"] }
mbedtls = { version = "0.13.0", default-features = false, features = ["rdrand", "std", "ssl"] }
pkix = ">=0.1.2, <0.3.0"

rustc-serialize = "0.3.24"
sdkms = { version = "0.3", default-features = false }
serde = "1.0.123"
serde = "1.0.214"
serde_bytes = "0.11"
serde_derive = "1.0.123"
serde_derive = "1.0.214"
serde_json = "1.0"
url = "1"
uuid = { version = "0.6.3", features = ["v4", "serde"] }
Expand Down
2 changes: 1 addition & 1 deletion em-app/examples/get-certificate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ publish = false

[dependencies]
em-app = { path = "../../" }
mbedtls = { version = "0.12", default-features = false, features = ["std"] }
mbedtls = { version = "0.13.0", default-features = false, features = ["std"] }
serde_json = "1.0"
2 changes: 1 addition & 1 deletion examples/tls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false

[dependencies]
chrono = "0.4"
mbedtls = { version = "0.12", default-features = false, features = ["std"] }
mbedtls = { version = "0.13.0", default-features = false, features = ["std"] }
2 changes: 1 addition & 1 deletion fortanix-vme/aws-nitro-enclaves/eif-tools/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env_logger = "0.9"
log = "0.4"
nitro-cli = { git = "https://github.com/fortanix/aws-nitro-enclaves-cli.git", branch = "main" }
once_cell = "1.9.0"
serde = { version = "1.0", features = ["derive"] }
serde = { version = "1.0.214", features = ["derive"] }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this necessary? Is there any dependency needs this?
Otherwise, you could just update the lock file and leave all these changes to serde in Cargo.toml untouched.

sha2 = "0.9.5"
tempdir = "0.3"
thiserror = "1.0"
4 changes: 2 additions & 2 deletions fortanix-vme/aws-nitro-enclaves/nitro-attestation-verify/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ publish = false
chrono = "0.4"
serde_cbor = "0.11"
aws-nitro-enclaves-cose = { version = "0.5.0", default-features = false }
mbedtls = { version = "0.12", features = ["rdrand", "std", "time", "ssl"], default-features = false, optional = true }
mbedtls = { version = "0.13.0", features = ["rdrand", "std", "time", "ssl"], default-features = false, optional = true }
num-bigint = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde = { version = "1.0.214", features = ["derive"] }
serde_bytes = "0.11"
pkix = ">=0.1.2, <0.3.0"
yasna = { version = "0.4", features = ["num-bigint"] }
Expand Down
3 changes: 2 additions & 1 deletion fortanix-vme/aws-nitro-enclaves/nitro-attestation-verify/src/mbedtls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use aws_nitro_enclaves_cose::crypto::{Hash, MessageDigest, SignatureAlgorithm, SigningPublicKey};
use aws_nitro_enclaves_cose::error::CoseError;
use mbedtls::alloc::Box as MbedtlsBox;
use mbedtls::error::{codes, Error as ErrMbed};
use mbedtls::hash::{self, Md};
use mbedtls::pk::EcGroupId;
use mbedtls::x509::Certificate;
Expand Down Expand Up @@ -97,7 +98,7 @@ impl SigningPublicKey for WrappedCert {
// We'll throw error if signature verify does not work
match pk.verify(*md, &digest, &sig) {
Ok(_) => Ok(true),
Err(mbedtls::Error::EcpVerifyFailed) => Ok(false),
Err(ErrMbed::HighLevel(codes::EcpVerifyFailed)) => Ok(false),
Err(e) => Err(CoseError::SignatureError(Box::new(e))),
}
}
Expand Down
6 changes: 3 additions & 3 deletions intel-sgx/dcap-artifact-retrieval/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ backoff = "0.4.0"
clap = { version = "2.23.3", optional = true }
lazy_static = "1"
lru-cache = "0.1.2"
mbedtls = { version = "0.12.3", features = [
mbedtls = { version = "0.13.0", features = [
"x509",
"ssl",
"std",
Expand All @@ -22,7 +22,7 @@ quick-error = "1.1.0"
rustc-serialize = "0.3"
reqwest = { version = "0.12", features = ["blocking", "native-tls"], optional = true }
serde_cbor = "0.11"
serde = { version = "1.0", features = ["derive"] }
serde = { version = "1.0.214", features = ["derive"] }
serde_json = "1.0"

[features]
Expand All @@ -33,6 +33,6 @@ yasna = { version = "0.3", features = ["num-bigint", "bit-vec"] }
pcs = { path = "../pcs", features = ["verify"] }

[build-dependencies]
mbedtls = { version = "0.12.3", features = ["ssl", "x509"] }
mbedtls = { version = "0.13.0", features = ["ssl", "x509"] }
pkix = "0.2.0"
serde_cbor = "0.11"
10 changes: 5 additions & 5 deletions intel-sgx/dcap-ql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ byteorder = "1.1.0" # Unlicense/MIT
anyhow = "1.0" # MIT/Apache-2.0
lazy_static = "1" # MIT/Apache-2.0
libc = { version = "0.2", optional = true } # MIT/Apache-2.0
mbedtls = { version = "0.12", default-features = false, features = ["std", "x509"], optional = true }
mbedtls = { version = "0.13.0", default-features = false, features = ["std", "x509"], optional = true }
num = { version = "0.2", optional = true }
num-derive = "0.2" # MIT/Apache-2.0
num-traits = "0.2" # MIT/Apache-2.0
serde = { version = "1.0.104", features = ["derive"], optional = true } # MIT/Apache-2.0
serde = { version = "1.0.214", features = ["derive"], optional = true } # MIT/Apache-2.0
yasna = { version = "0.3", features = ["num-bigint", "bit-vec"], optional = true }

[dev-dependencies]
mbedtls = { version = "0.12" }
mbedtls = { version = "0.13.0" }
report-test = { version = "0.4.0", path = "../report-test" }
sgxs = { version = "0.8.0", path = "../sgxs" }
serde = { version = "1.0.104", features = ["derive"] }
serde_json = { version = "1.0" }
serde = { version = "1.0.214", features = ["derive"] }
serde_json = { version = "1.0.133" }
4 changes: 2 additions & 2 deletions intel-sgx/ias/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ percent-encoding = "2.1"
serde_bytes = "0.11"
serde-bytes-repr = { version = "0.1", optional = true }
serde_json = { version = "1", optional = true }
serde = { version = "1.0.7", features = ["derive"] }
serde = { version = "1.0.214", features = ["derive"] }
url = "2.2"

mbedtls = { version = "0.12", features = ["std"], default-features = false, optional = true }
mbedtls = { version = "0.13.0", features = ["std"], default-features = false, optional = true }
pkix = ">=0.1.0, <0.3.0"

sgx-isa = { version = "0.4", path = "../sgx-isa" }
Expand Down
4 changes: 2 additions & 2 deletions intel-sgx/pcs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sgx-isa = { path = "../sgx-isa", default-features = true }
pkix = "0.2.0"
yasna = { version = "0.3", features = ["num-bigint", "bit-vec"] }
rustc-serialize = "0.3"
serde = { version = "1.0.7", features = ["derive"] }
serde = { version = "1.0.214", features = ["derive"] }
sgx_pkix = "0.2"
serde_json = { version = "1.0", features = ["raw_value"] }
percent-encoding = "2.1.0"
Expand All @@ -23,7 +23,7 @@ failure = "0.1.1"
anyhow = { version = "1", optional = true }
quick-error = "1.2.3"
num = "0.2"
mbedtls = { version = "0.12.3", features = ["std", "time"], default-features = false, optional = true }
mbedtls = { version = "0.13.0", features = ["std", "time"], default-features = false, optional = true }

[dev-dependencies]
hex = "0.4.2"
Expand Down
4 changes: 2 additions & 2 deletions intel-sgx/sgx-isa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ categories = ["hardware-support"]

[dev-dependencies]
# External dependencies
mbedtls = { version = "0.12", default-features = false, features = ["std"] }
mbedtls = { version = "0.13.0", default-features = false, features = ["std"] }

[dependencies]
# External dependencies
bitflags = "1" # MIT/Apache-2.0
serde = { version = "1.0.104", features = ["derive"], optional = true } # MIT/Apache-2.0
serde = { version = "1.0.214", features = ["derive"], optional = true } # MIT/Apache-2.0

[features]
large_array_derive = []
Expand Down
Loading