From ead0260165e4842a700c02fcd754ddd2c6c53e53 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Sat, 4 Jul 2020 17:38:52 +0200 Subject: [PATCH 1/4] Bump rustls to 0.18 Signed-off-by: Marc-Antoine Perennou --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7adf45c..4259f17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/ctz/rustls-native-certs" categories = ["network-programming", "cryptography"] [dependencies] -rustls = "0.17.0" +rustls = "0.18.0" [dev-dependencies] webpki = "0.21" From 62efde220da2b3d81f8438ad3702e92a851a105b Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Sat, 4 Jul 2020 22:33:19 +0200 Subject: [PATCH 2/4] CI: try to fix windows failure Signed-off-by: Marc-Antoine Perennou --- tests/compare_mozilla.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/compare_mozilla.rs b/tests/compare_mozilla.rs index 1298f78..5c69952 100644 --- a/tests/compare_mozilla.rs +++ b/tests/compare_mozilla.rs @@ -37,6 +37,7 @@ fn stringify_x500name(subject: &[u8]) -> String { &[0x55, 0x04, 0x09] => "STREET", &[0x55, 0x04, 0x0a] => "O", &[0x55, 0x04, 0x0b] => "OU", + &[0x55, 0x04, 0x11] => "postalCode", &[0x55, 0x04, 0x61] => "organizationIdentifier", &[0x09, 0x92, 0x26, 0x89, 0x93, 0xf2, 0x2c, 0x64, 0x01, 0x19] => "domainComponent", &[0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x09, 0x01] => "emailAddress", From 31341846435f8515a379af0b297991b1f0664c06 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Sat, 4 Jul 2020 22:43:40 +0200 Subject: [PATCH 3/4] Bump security-framework to 1.0 Signed-off-by: Marc-Antoine Perennou --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4259f17..8874724 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,4 +26,4 @@ schannel = "0.1.15" openssl-probe = "0.1.2" [target.'cfg(target_os = "macos")'.dependencies] -security-framework = "0.4.0" +security-framework = "1.0.0" From aa51715cc895057e6336d0f9ec7d93c7bb78eccb Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Sat, 4 Jul 2020 22:58:32 +0200 Subject: [PATCH 4/4] CI: update allowed threshold for windows vm Signed-off-by: Marc-Antoine Perennou --- tests/compare_mozilla.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/compare_mozilla.rs b/tests/compare_mozilla.rs index 5c69952..5cd14bb 100644 --- a/tests/compare_mozilla.rs +++ b/tests/compare_mozilla.rs @@ -85,6 +85,9 @@ fn test_does_not_have_many_roots_unknown_by_mozilla() { } } + #[cfg(windows)] + let threshold = 1.6; // no more than 160% extra roots; windows CI vm has lots of extra roots + #[cfg(not(windows))] let threshold = 0.5; // no more than 50% extra roots let diff = (missing_in_moz_roots as f64) / (mozilla.len() as f64); println!("mozilla: {:?}", mozilla.len());