Skip to content
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

Jump to bottom

Upgrade to (moved ServerName) alpha releases #51

Merged
merged 3 commits into from
Nov 23, 2023
Merged

Upgrade to (moved ServerName) alpha releases #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87161a8
Fixate rustls-pemfile alpha version
djc Nov 23, 2023
b998e0f
Upgrade to latest webpki alpha
djc Nov 21, 2023
6cf5aba
Bump version to alpha.2
djc Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "webpki-roots"
version = "0.26.0-alpha.1"
version = "0.26.0-alpha.2"
edition = "2018"
readme = "README.md"
license = "MPL-2.0"
Expand All @@ -9,7 +9,7 @@ homepage = "https://github.com/rustls/webpki-roots"
repository = "https://github.com/rustls/webpki-roots"

[dependencies]
pki-types = { package = "rustls-pki-types", version = "0.2", default-features = false }
pki-types = { package = "rustls-pki-types", version = "0.2.2", default-features = false }

[dev-dependencies]
chrono = { version = "0.4.26", default-features = false, features = ["clock"] }
Expand All @@ -20,9 +20,9 @@ percent-encoding = "2.3"
rcgen = "0.11.1"
reqwest = { version = "0.11", features = ["rustls-tls-manual-roots"] }
ring = "0.17.0"
rustls-pemfile = "2.0.0-alpha.1"
rustls-pemfile = "=2.0.0-alpha.1"
serde = { version = "1.0.183", features = ["derive"] }
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
webpki = { package = "rustls-webpki", version = "=0.102.0-alpha.6" }
webpki = { package = "rustls-webpki", version = "=0.102.0-alpha.7", features = ["alloc"] }
x509-parser = "0.15.1"
yasna = "0.5.2"
4 changes: 2 additions & 2 deletions tests/codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use num_bigint::BigUint;
use pki_types::CertificateDer;
use ring::digest;
use serde::Deserialize;
use webpki::extract_trust_anchor;
use webpki::anchor_from_trusted_cert;
use x509_parser::prelude::AttributeTypeAndValue;
use x509_parser::x509::X509Name;

Expand Down Expand Up @@ -92,7 +92,7 @@ async fn new_generated_code_is_fresh() {
assert_eq!(calculated_fp.as_ref(), metadata_fp.as_slice());

let ta_der = CertificateDer::from(der.as_ref());
let ta = extract_trust_anchor(&ta_der).expect("malformed trust anchor der");
let ta = anchor_from_trusted_cert(&ta_der).expect("malformed trust anchor der");
subject.clear();
for &b in ta.subject.as_ref() {
write!(&mut subject, "{}", escape_default(b)).unwrap();
Expand Down
12 changes: 6 additions & 6 deletions tests/verify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use core::time::Duration;
use std::convert::TryFrom;

use pki_types::{CertificateDer, SignatureVerificationAlgorithm, UnixTime};
use pki_types::{CertificateDer, SignatureVerificationAlgorithm, UnixTime, ServerName};
use rcgen::{BasicConstraints, Certificate, CertificateParams, DnType, IsCa, KeyUsagePurpose};
use webpki::{extract_trust_anchor, EndEntityCert, Error, KeyUsage, SubjectNameRef};
use webpki::{anchor_from_trusted_cert, EndEntityCert, Error, KeyUsage};
use x509_parser::extensions::{GeneralName, NameConstraints as X509ParserNameConstraints};
use x509_parser::prelude::FromDer;

Expand All @@ -17,7 +17,7 @@ fn name_constraints() {
{
let time = UnixTime::since_unix_epoch(Duration::from_secs(0x40000000)); // Time matching rcgen default.
let test_case = ConstraintTest::new(name_constraints.as_ref());
let trust_anchors = &[extract_trust_anchor(&test_case.trust_anchor).unwrap()];
let trust_anchors = &[anchor_from_trusted_cert(&test_case.trust_anchor).unwrap()];

// Each permitted EE should verify without error.
for permitted_ee in test_case.permitted_certs {
Expand Down Expand Up @@ -165,7 +165,7 @@ fn tubitak_name_constraint_works() {
let inter = CertificateDer::from(&include_bytes!("data/tubitak/inter.der")[..]);
let subj = CertificateDer::from(&include_bytes!("data/tubitak/subj.der")[..]);

let roots = [extract_trust_anchor(&root).unwrap().to_owned()];
let roots = [anchor_from_trusted_cert(&root).unwrap().to_owned()];
let now = UnixTime::since_unix_epoch(Duration::from_secs(1493668479));
let cert = EndEntityCert::try_from(&subj).unwrap();
cert.verify_for_usage(
Expand All @@ -179,8 +179,8 @@ fn tubitak_name_constraint_works() {
)
.unwrap();

let subject = SubjectNameRef::try_from_ascii_str("testssl.kamusm.gov.tr").unwrap();
cert.verify_is_valid_for_subject_name(subject).unwrap();
let subject = ServerName::try_from("testssl.kamusm.gov.tr").unwrap();
cert.verify_is_valid_for_subject_name(&subject).unwrap();
}

static ALL_ALGORITHMS: &[&dyn SignatureVerificationAlgorithm] = &[
Expand Down