Skip to content

Replace expired certificate in tests #13

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

Merged
merged 2 commits into from
Nov 23, 2018
Merged

Replace expired certificate in tests #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bf423a
Replace expired certificate in tests
sduquette-devolutions Nov 22, 2018
65ed0ab
Add time/zlib features to mbedtls crate, test for them
Nov 23, 2018
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 1 addition & 0 deletions ct.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions mbedtls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mbedtls"
version = "0.2.0"
version = "0.3.0"
authors = ["Jethro Beekman <[email protected]>"]
build = "build.rs"
license = "Apache-2.0/GPL-2.0+"
Expand Down Expand Up @@ -39,14 +39,16 @@ 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"]
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"
Expand Down
34 changes: 17 additions & 17 deletions mbedtls/tests/support/keys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";