Skip to content

Commit 0a6098b

Browse files
MS-megliuancwrd1
authored andcommitted
revert back as_chain_der() parameter change
1 parent c54087a commit 0a6098b

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

examples/client.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use rustls::{
1313
use rustls_pki_types::{CertificateDer, ServerName};
1414

1515
use rustls_cng::{
16-
cert::ChainEngineType,
1716
signer::CngSigningKey,
1817
store::{CertStore, CertStoreType},
1918
};
@@ -38,7 +37,7 @@ fn get_chain(
3837
let key = context.acquire_key()?;
3938
let signing_key = CngSigningKey::new(key)?;
4039
let chain = context
41-
.as_chain_der(true, ChainEngineType::HkeyLocalMachine)?
40+
.as_chain_der()?
4241
.into_iter()
4342
.map(Into::into)
4443
.collect();

examples/server.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use rustls::{
1313
};
1414

1515
use rustls_cng::{
16-
cert::ChainEngineType,
1716
signer::CngSigningKey,
1817
store::{CertStore, CertStoreType},
1918
};
@@ -75,9 +74,7 @@ impl ResolvesServerCert for ServerCertResolver {
7574
println!("Key alg: {:?}", key.key().algorithm());
7675

7776
// attempt to acquire a full certificate chain
78-
let chain = context
79-
.as_chain_der(true, ChainEngineType::HkeyLocalMachine)
80-
.ok()?;
77+
let chain = context.as_chain_der().ok()?;
8178
let certs = chain.into_iter().map(Into::into).collect();
8279

8380
// return CertifiedKey instance

tests/test_client_server.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mod client {
1616
};
1717
use rustls_pki_types::CertificateDer;
1818

19-
use rustls_cng::{cert::ChainEngineType, signer::CngSigningKey, store::CertStore};
19+
use rustls_cng::{signer::CngSigningKey, store::CertStore};
2020

2121
#[derive(Debug)]
2222
pub struct ClientCertResolver(CertStore, String);
@@ -32,7 +32,7 @@ mod client {
3232
let key = context.acquire_key()?;
3333
let signing_key = CngSigningKey::new(key)?;
3434
let chain = context
35-
.as_chain_der(true, ChainEngineType::HkeyLocalMachine)?
35+
.as_chain_der()?
3636
.into_iter()
3737
.map(Into::into)
3838
.collect();
@@ -111,7 +111,7 @@ mod server {
111111
RootCertStore, ServerConfig, ServerConnection, Stream,
112112
};
113113

114-
use rustls_cng::{cert::ChainEngineType, signer::CngSigningKey, store::CertStore};
114+
use rustls_cng::{signer::CngSigningKey, store::CertStore};
115115

116116
#[derive(Debug)]
117117
pub struct ServerCertResolver(CertStore);
@@ -127,9 +127,7 @@ mod server {
127127
CngSigningKey::new(key).ok().map(|key| (ctx, key))
128128
})?;
129129

130-
let chain = context
131-
.as_chain_der(true, ChainEngineType::HkeyLocalMachine)
132-
.ok()?;
130+
let chain = context.as_chain_der().ok()?;
133131
let certs = chain.into_iter().map(Into::into).collect();
134132

135133
Some(Arc::new(CertifiedKey {

0 commit comments

Comments
 (0)