Skip to content

Commit

Permalink
Update to rustls 0.22.0-alpha.3
Browse files Browse the repository at this point in the history
  • Loading branch information
tottoto authored and djc committed Sep 24, 2023
1 parent acd5e9c commit 8a9da80
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ pki-types = { package = "rustls-pki-types", version = "0.2" }

[dev-dependencies]
ring = "0.16.5"
rustls = "=0.22.0-alpha.2"
rustls-webpki = "=0.102.0-alpha.2"
rustls = "=0.22.0-alpha.3"
rustls-webpki = "=0.102.0-alpha.3"
serial_test = "2"
untrusted = "0.7.0" # stick to the version ring depends on for now
webpki-roots = "=0.26.0-alpha.1"
Expand Down
4 changes: 1 addition & 3 deletions examples/google.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ use std::io::{stdout, Read, Write};
use std::net::TcpStream;
use std::sync::Arc;

use rustls::crypto::ring::Ring;

fn main() {
let mut roots = rustls::RootCertStore::empty();
for cert in rustls_native_certs::load_native_certs().expect("could not load platform certs") {
roots.add(cert).unwrap();
}

let config = rustls::ClientConfig::<Ring>::builder()
let config = rustls::ClientConfig::builder()
.with_safe_defaults()
.with_root_certificates(roots)
.with_no_client_auth();
Expand Down
3 changes: 1 addition & 2 deletions tests/smoketests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use std::path::PathBuf;
use std::sync::Arc;
use std::{env, panic};

use rustls::crypto::ring::Ring;
// #[serial] is used on all these tests to run them sequentially. If they're run in parallel,
// the global env var configuration in the env var test interferes with the others.
use serial_test::serial;
Expand All @@ -15,7 +14,7 @@ fn check_site(domain: &str) {
roots.add(cert).unwrap();
}

let config = rustls::ClientConfig::<Ring>::builder()
let config = rustls::ClientConfig::builder()
.with_safe_defaults()
.with_root_certificates(roots)
.with_no_client_auth();
Expand Down

0 comments on commit 8a9da80

Please sign in to comment.