Skip to content

Commit b08a15f

Browse files
authored
Try #127:
2 parents e9a14e4 + 8b17c8f commit b08a15f

File tree

11 files changed

+1087
-13
lines changed

11 files changed

+1087
-13
lines changed

Cargo.lock

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

ct.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ if [ $TRAVIS_RUST_VERSION = "stable" ] || [ $TRAVIS_RUST_VERSION = "beta" ] || [
1313
rustup default $TRAVIS_RUST_VERSION
1414
# make sure that explicitly providing the default target works
1515
cargo test --target x86_64-unknown-linux-gnu
16+
cargo test --release
1617
cargo test --features spin_threading
1718
cargo test --features rust_threading
1819
cargo test --features custom_time,custom_gmtime_r

mbedtls/Cargo.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ num-bigint = { version = "0.2", optional = true }
3030
bit-vec = { version = "0.5", optional = true }
3131
block-modes = { version = "0.3", optional = true }
3232
rc2 = { version = "0.3", optional = true }
33+
tokio = { version = "0.3", optional = true }
3334

3435
[target.x86_64-fortanix-unknown-sgx.dependencies]
3536
rs-libc = "0.1.0"
@@ -83,6 +84,16 @@ name = "server"
8384
path = "examples/server.rs"
8485
required-features = ["std"]
8586

87+
[[test]]
88+
name = "alpn"
89+
path = "tests/alpn.rs"
90+
required-features = ["std"]
91+
92+
[[test]]
93+
name = "async_session"
94+
path = "tests/async_session.rs"
95+
required-features = ["std", "threading", "tokio", "tokio/net", "tokio/io-util", "tokio/macros"]
96+
8697
[[test]]
8798
name = "client_server"
8899
path = "tests/client_server.rs"

mbedtls/src/rng/ctr_drbg.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ impl<'entropy> DerefMut for CtrDrbg<'entropy> {
102102

103103
// ==== END IMMOVABLE TYPE KLUDGE ====
104104

105+
#[cfg(feature = "threading")]
106+
unsafe impl<'entropy> Send for CtrDrbg<'entropy> {}
107+
105108
#[cfg(feature = "threading")]
106109
unsafe impl<'entropy> Sync for CtrDrbg<'entropy> {}
107110

0 commit comments

Comments
 (0)