Skip to content

Commit d7ab425

Browse files
committed
Fixed unit tests
1 parent 5b6f958 commit d7ab425

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

examples/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fn main() -> anyhow::Result<()> {
130130
store,
131131
cert_name: params.client_cert.clone(),
132132
pin: params.password.clone(),
133-
}));
133+
}))?;
134134

135135
let server_name = ServerName::try_from(params.server_name.as_str())?.to_owned();
136136
let mut connection = ClientConnection::new(Arc::new(client_config), server_name)?;

examples/server.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,14 @@ fn main() -> anyhow::Result<()> {
139139
let mut root_store = RootCertStore::empty();
140140
root_store.add(ca_cert.as_der().into())?;
141141

142-
let verifier = WebPkiClientVerifier::builder(Arc::new(root_store))
143-
.build()
144-
.unwrap();
142+
let verifier = WebPkiClientVerifier::builder(Arc::new(root_store)).build()?;
145143

146144
let server_config = ServerConfig::builder()
147145
.with_client_cert_verifier(verifier)
148146
.with_cert_resolver(Arc::new(ServerCertResolver {
149147
store,
150148
pin: params.password.clone(),
151-
}));
149+
}))?;
152150

153151
let server = TcpListener::bind(format!("0.0.0.0:{PORT}"))?;
154152

tests/test_client_server.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ mod client {
7676
.with_client_cert_resolver(Arc::new(ClientCertResolver(
7777
store,
7878
"rustls-client".to_string(),
79-
)));
79+
)))?;
8080

8181
let mut connection =
8282
ClientConnection::new(Arc::new(client_config), "rustls-server".try_into()?)?;
@@ -156,13 +156,11 @@ mod server {
156156
let mut root_store = RootCertStore::empty();
157157
root_store.add(ca_cert.as_der().into())?;
158158

159-
let verifier = WebPkiClientVerifier::builder(Arc::new(root_store))
160-
.build()
161-
.unwrap();
159+
let verifier = WebPkiClientVerifier::builder(Arc::new(root_store)).build()?;
162160

163161
let server_config = ServerConfig::builder()
164162
.with_client_cert_verifier(verifier)
165-
.with_cert_resolver(Arc::new(ServerCertResolver(store)));
163+
.with_cert_resolver(Arc::new(ServerCertResolver(store)))?;
166164

167165
let server = TcpListener::bind("127.0.0.1:0")?;
168166

0 commit comments

Comments
 (0)