File tree Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -447,10 +447,8 @@ fn get_root_certs(ca_file: Option<String>) -> Result<rustls::RootCertStore> {
447447 let f = File :: open ( ca_file) . context ( "Open CA certificate" ) ?;
448448 let mut reader = BufReader :: new ( f) ;
449449 let certs = rustls_pemfile:: certs ( & mut reader) ;
450- for cert in certs {
451- if let Ok ( cert) = cert {
452- roots. add ( cert) ?;
453- }
450+ for cert in certs. flatten ( ) {
451+ roots. add ( cert) ?;
454452 }
455453 }
456454
@@ -471,8 +469,8 @@ fn load_cert(cert_file: &str) -> Result<Vec<CertificateDer<'static>>> {
471469fn load_key ( key_file : & str ) -> Result < PrivateKeyDer < ' static > > {
472470 let f = File :: open ( key_file) . context ( "Open private key" ) ?;
473471 let mut reader = BufReader :: new ( f) ;
474- let keys = rustls_pemfile:: pkcs8_private_keys ( & mut reader) ;
475- for key in keys {
472+ let mut keys = rustls_pemfile:: pkcs8_private_keys ( & mut reader) ;
473+ if let Some ( key) = keys. next ( ) {
476474 match key {
477475 Ok ( v) => return Ok ( PrivateKeyDer :: Pkcs8 ( v. clone_key ( ) ) ) ,
478476 Err ( e) => {
You can’t perform that action at this time.
0 commit comments