Skip to content

Commit 7d4d6c2

Browse files
authored
update rcgen and webpki (#13)
1 parent 9a009b6 commit 7d4d6c2

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustls-cng-crypto"
33
authors = ["Tom Fay <tom@teamfay.co.uk>"]
4-
version = "0.1.1"
4+
version = "0.1.2"
55
edition = "2021"
66
license = "MIT"
77
description = "Rustls crypto provider for CNG"
@@ -29,7 +29,7 @@ tls12 = ["rustls/tls12"]
2929
[dev-dependencies]
3030
aws-lc-rs = { version = "1.11.1", features = ["prebuilt-nasm"] }
3131
hex = "0.4.3"
32-
rcgen = { version = "0.13.1", default-features = false, features = [
32+
rcgen = { version = "0.14.1", default-features = false, features = [
3333
"crypto",
3434
"aws_lc_rs",
3535
"pem",
@@ -41,7 +41,7 @@ rustls = { version = "0.23.0", features = [
4141
], default-features = false }
4242
rustls-pemfile = "2"
4343
rustls-webpki = { version = "0.103.0", default-features = false }
44-
webpki-roots = "0.26"
44+
webpki-roots = "1.0"
4545
wycheproof = { version = "0.6.0", default-features = false, features = [
4646
"aead",
4747
"ecdsa",

tests/server.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
use std::io::Write;
33
use std::sync::Arc;
44

5-
use rcgen::SignatureAlgorithm;
5+
use rcgen::{Issuer, SignatureAlgorithm};
66
use rustls::pki_types::{CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer};
77
use rustls::server::Acceptor;
88
use rustls::ServerConfig;
@@ -85,16 +85,15 @@ impl TestPki {
8585

8686
let ca_key = rcgen::KeyPair::generate_for(alg).unwrap();
8787
let ca_cert = ca_params.self_signed(&ca_key).unwrap();
88+
let issuer = Issuer::new(ca_params, ca_key);
8889

8990
// Create a server end entity cert issued by the CA.
9091
let mut server_ee_params =
9192
rcgen::CertificateParams::new(vec!["localhost".to_string()]).unwrap();
9293
server_ee_params.is_ca = rcgen::IsCa::NoCa;
9394
server_ee_params.extended_key_usages = vec![rcgen::ExtendedKeyUsagePurpose::ServerAuth];
9495
let server_key = rcgen::KeyPair::generate_for(alg).unwrap();
95-
let server_cert = server_ee_params
96-
.signed_by(&server_key, &ca_cert, &ca_key)
97-
.unwrap();
96+
let server_cert = server_ee_params.signed_by(&server_key, &issuer).unwrap();
9897

9998
Self {
10099
ca_cert: ca_cert.into(),

0 commit comments

Comments
 (0)