From 5bf423a3e93f86ae1b311895b9bc7e45432b21de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Duquette?= Date: Thu, 22 Nov 2018 16:37:36 -0500 Subject: [PATCH 1/2] Replace expired certificate in tests --- mbedtls/tests/support/keys.rs | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/mbedtls/tests/support/keys.rs b/mbedtls/tests/support/keys.rs index 4c1f9ce06..3aac92391 100644 --- a/mbedtls/tests/support/keys.rs +++ b/mbedtls/tests/support/keys.rs @@ -40,21 +40,21 @@ YLT4mPYORlR4AgzvpNOJiI3T pub const PEM_CERT_SUBJECT: &'static str = "CN=mbedtls.example"; pub const PEM_CERT: &'static [u8] = b"-----BEGIN CERTIFICATE----- -MIIDBzCCAe+gAwIBAgIJAPSt7jywaaaUMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV -BAMMD21iZWR0bHMuZXhhbXBsZTAeFw0xNjA3MTcwMDI4MDBaFw0xNjA4MTYwMDI4 -MDBaMBoxGDAWBgNVBAMMD21iZWR0bHMuZXhhbXBsZTCCASIwDQYJKoZIhvcNAQEB -BQADggEPADCCAQoCggEBAMWMCCYIlSYoBD84CDQwGHcTb6XlqxId0E2ZObSCve+a -eYVxSqUilQbcEZ3zmjRz1fmqfEEolp9Mku7bFGqPHVMyUF21Wk/QJfLmo9jC87xR -YgbKuyeLLwZ+kONcaRQVub3ULDVz+UIPtHXqUscr7s2mr2jGmTcp8weK9CisV3fV -vKjRXFm/+wVhWIJsO05iYyJ9Bf+qSqxu+TFK4+SXOnEDEXzbia0oxGKbAZBtni1s -uUAU26A7TZ5XQerzEfF9uY2tuVKojLrz9R2ODhj194WLw1V9iD+uwWO4v4W//d0s -EGFox9/JX0nR5QteBXDllc1pCApvqxIFCqJTct+0cNMCAwEAAaNQME4wHQYDVR0O -BBYEFG5EvLWga4UA6u7dfahX0c4vKvOpMB8GA1UdIwQYMBaAFG5EvLWga4UA6u7d -fahX0c4vKvOpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJdEPHa5 -ZEbCPg5PZR6eR4Q18Kirc0AdxHxLj+mQ82peVApJQaJV/DsgychtyjkOtQtjKrwR -vQ8WJmuRss5Zz5j/1FZ63jv7trfDHYLoSj8txN/a97moxuGyDCHFhL0JkKrfvlGc -FKabmRzfobT4X6fG3VU4V8RUnds+csbexebv1KcIXP+b5CK+IxbPKBbyx8gExKfe -ZmCb/71RMkoSc/VJjiVE/ga7TTyZRafPRpo3HdoQjfaLqiauepxDlOTBuNV7/rkF -/if9bp/95p9r6zHZptA8FR3G8AE/51YKYXXAYvYVWZMmv7C/HohsxuUFiwsWL8wj -DkE8WwauXJbQcvE= +MIIDCTCCAfGgAwIBAgIJALWh9vlifeRuMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV +BAMTD21iZWR0bHMuZXhhbXBsZTAgFw0xODExMjMwNTQ5MTBaGA8yMTAwMDEwMTA1 +NDkxMFowGjEYMBYGA1UEAxMPbWJlZHRscy5leGFtcGxlMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAxYwIJgiVJigEPzgINDAYdxNvpeWrEh3QTZk5tIK9 +75p5hXFKpSKVBtwRnfOaNHPV+ap8QSiWn0yS7tsUao8dUzJQXbVaT9Al8uaj2MLz +vFFiBsq7J4svBn6Q41xpFBW5vdQsNXP5Qg+0depSxyvuzaavaMaZNynzB4r0KKxX +d9W8qNFcWb/7BWFYgmw7TmJjIn0F/6pKrG75MUrj5Jc6cQMRfNuJrSjEYpsBkG2e +LWy5QBTboDtNnldB6vMR8X25ja25UqiMuvP1HY4OGPX3hYvDVX2IP67BY7i/hb/9 +3SwQYWjH38lfSdHlC14FcOWVzWkICm+rEgUKolNy37Rw0wIDAQABo1AwTjAdBgNV +HQ4EFgQUbkS8taBrhQDq7t19qFfRzi8q86kwHwYDVR0jBBgwFoAUbkS8taBrhQDq +7t19qFfRzi8q86kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAD8JW +PJrqtwaTtmmpFv8Xn8K2Tq7BBKg7ANtEs9Ca2SstR9J0idH8YYq69+CHbihO0cVS +QYgkos9FA7NU8eV8twNBBrgSS30ZkIVRCZn72476lHQTWnctqHTqkNmypt5Bdosr +yC9+dy8UCm9UhjW100vu0Oi++/7LU3GOcEuFX65pz4cjFFRLCKmA0mvSiBV4UwWu +HYDzyrZMYYcIpPBj9S7gvoQDeHrpw7yfA5Of+60cZZjwPY9Ebud5ETWnkFqqcShE +PVTB987Vm6hLu5/oHF+JVW05ZdXID1BZvukBYXnwY9OHvU7fin8N/eT/SBTd2HxO +d1SSYr2U5pj0tNqaDQ== -----END CERTIFICATE-----\0"; From 65ed0ab8e7b528ac4f7f67419a844ce459ff573a Mon Sep 17 00:00:00 2001 From: Jethro Beekman Date: Fri, 23 Nov 2018 11:11:47 +0530 Subject: [PATCH 2/2] Add time/zlib features to mbedtls crate, test for them --- Cargo.lock | 2 +- README.md | 2 ++ ct.sh | 1 + mbedtls/Cargo.toml | 6 ++++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05dca242f..288abefb2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -142,7 +142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "mbedtls" -version = "0.2.0" +version = "0.3.0" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core_io 0.1.20180307 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/README.md b/README.md index 28c16e004..adeb63084 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,11 @@ This is a list of the Cargo features available for mbedtls-sys. Features in * *pthread* Enable mutex synchronization using pthreads. * *rdrand* Enable the RDRAND random number generator. * *spin_threading* Enable mutex synchronization using the spin crate. +* **time** Enable time support in mbedtls-sys. * **std** If this feature is not enabled, this crate is a no_std crate. (An allocator is *required*) The necessary C functions to make MbedTLS work without libc will be provided. +* *zlib* Enable zlib support in mbedtls-sys. PRs adding new features are encouraged. diff --git a/ct.sh b/ct.sh index 9caa4a0f5..787d1fcaf 100755 --- a/ct.sh +++ b/ct.sh @@ -4,6 +4,7 @@ cd "$(dirname "$0")/mbedtls" cargo +stable test cargo +stable test --features spin_threading +cargo +stable test --features zlib # Pinned to this particular nightly version because of core_io. This can be # re-pinned whenever core_io is updated to the latest nightly. cargo +nightly-2018-03-07 test --no-default-features --features core_io,rdrand diff --git a/mbedtls/Cargo.toml b/mbedtls/Cargo.toml index 39c5cc214..56067d9b5 100644 --- a/mbedtls/Cargo.toml +++ b/mbedtls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mbedtls" -version = "0.2.0" +version = "0.3.0" authors = ["Jethro Beekman "] build = "build.rs" license = "Apache-2.0/GPL-2.0+" @@ -39,7 +39,7 @@ gcc = "0.3.28" [features] # Features are documented in the README -default = ["std", "aesni"] +default = ["std", "aesni", "time"] std = ["mbedtls-sys-auto/std","serde/std"] threading = [] pthread = ["threading","std","mbedtls-sys-auto/pthread"] @@ -47,6 +47,8 @@ spin_threading = ["threading","spin","mbedtls-sys-auto/custom_threading"] force_aesni_support = ["mbedtls-sys-auto/custom_has_support","aesni"] rdrand = [] aesni = ["mbedtls-sys-auto/aesni"] +zlib = ["mbedtls-sys-auto/zlib"] +time = ["mbedtls-sys-auto/time"] [[example]] name = "client"