diff --git a/Cargo.toml b/Cargo.toml index 9d663609..4f96e962 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,7 +118,7 @@ version = "1.12.0" optional = true [dependencies.tokio-rustls] -version = "0.23.3" +version = "0.24.0" optional = true features = ["dangerous_configuration"] @@ -144,7 +144,15 @@ version = "0.7" features = ["compat"] [dev-dependencies.tokio] -features = ["macros", "sync", "io-std", "time", "io-util", "net", "rt-multi-thread"] +features = [ + "macros", + "sync", + "io-std", + "time", + "io-util", + "net", + "rt-multi-thread", +] version = "1.0" [dev-dependencies.async-std] diff --git a/docker/certs/customCA.srl b/docker/certs/customCA.srl index f5effb93..50276505 100644 --- a/docker/certs/customCA.srl +++ b/docker/certs/customCA.srl @@ -1 +1 @@ -0DAEECC45C07F5E06E0DD1B05115C3CFD1A46D9A +0DAEECC45C07F5E06E0DD1B05115C3CFD1A46D9B diff --git a/docker/certs/server-full.crt b/docker/certs/server-full.crt index 105dc00e..772eadf4 100644 --- a/docker/certs/server-full.crt +++ b/docker/certs/server-full.crt @@ -1,33 +1,33 @@ -----BEGIN CERTIFICATE----- -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 -dgddeBaax7GTJImkDo8ExraWDokv0MsE +BQcDAjAdBgNVHQ4EFgQUTO5ZZ+/akKYt156AFTj8iJ1BfmQwHwYDVR0jBBgwFoAU +RHcTzm1u6x8WiXeAWDblHzwBt9kwDQYJKoZIhvcNAQELBQADggIBAIhdGWm+ph6+ +t+0EKkcQSnFH7vOdyERBV3BWH+aWacO3HV8xq4U8CITNTDEIIJ0lU0RSjlqhbQOS +Y+ug8GDmmkk6FqPV7mcG5mCDRA2WNOF6l9aVE7kVaR6eIKJ1p8VGdmUrInNLzuOX +sAnuf4TKXDGDda6qE0IckKu32xN2dTMwp/rb+HodZ38VMznUy214iY1KMuYp0XGZ +Nw3QkEaDu/aXelSjipDRvIwvTj/dsL4yt3Cw4QorMrzHEd4gwiJ74F6KZx5oqrcl +CNwfkrVWQIkXqkKtleuLncOaoj2gsYBdDO++nz6yXXSWgQarlarmhcTPrB89hXjv +qNdVA/itWV46958t32eq/BXB2y4G/F4OLED1rBELPqM3LZ/EnkTqZOQr3Wd/Nxni +uo/NU0wH1YQ12cp5NlBee3v/Tu0BZQoc/pBAUU0ZrSevN2aqp+08iK00r3lbcK2/ +FCdTKYxMWNTspwlrcdt4Nnzu9i5YtwoA247WTB3O1pFewwldBVGYfkGqhd4rVU3+ +29Hug6Ghee2PR+4gWbxbPlvNvKr1fdNaoszknSih5eB/iZ25p3QtGKT3dA1wj7n7 +vaK3rm4SfwYnJ+T9Qa9Wmyv/vugPuovVAH0JxpPpziJtelcVeQrEoZfCzm6gzv6U +sIKYwEBx8av830JU/d9P/dzG7PMUJ7vv -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIE/zCCAuegAwIBAgIUATFLyERaRfsQiPasMC5l0vrBMUMwDQYJKoZIhvcNAQEL diff --git a/docker/certs/server.crt b/docker/certs/server.crt index 184ad33d..25170cb0 100644 --- a/docker/certs/server.crt +++ b/docker/certs/server.crt @@ -1,31 +1,31 @@ -----BEGIN CERTIFICATE----- -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 -dgddeBaax7GTJImkDo8ExraWDokv0MsE +BQcDAjAdBgNVHQ4EFgQUTO5ZZ+/akKYt156AFTj8iJ1BfmQwHwYDVR0jBBgwFoAU +RHcTzm1u6x8WiXeAWDblHzwBt9kwDQYJKoZIhvcNAQELBQADggIBAIhdGWm+ph6+ +t+0EKkcQSnFH7vOdyERBV3BWH+aWacO3HV8xq4U8CITNTDEIIJ0lU0RSjlqhbQOS +Y+ug8GDmmkk6FqPV7mcG5mCDRA2WNOF6l9aVE7kVaR6eIKJ1p8VGdmUrInNLzuOX +sAnuf4TKXDGDda6qE0IckKu32xN2dTMwp/rb+HodZ38VMznUy214iY1KMuYp0XGZ +Nw3QkEaDu/aXelSjipDRvIwvTj/dsL4yt3Cw4QorMrzHEd4gwiJ74F6KZx5oqrcl +CNwfkrVWQIkXqkKtleuLncOaoj2gsYBdDO++nz6yXXSWgQarlarmhcTPrB89hXjv +qNdVA/itWV46958t32eq/BXB2y4G/F4OLED1rBELPqM3LZ/EnkTqZOQr3Wd/Nxni +uo/NU0wH1YQ12cp5NlBee3v/Tu0BZQoc/pBAUU0ZrSevN2aqp+08iK00r3lbcK2/ +FCdTKYxMWNTspwlrcdt4Nnzu9i5YtwoA247WTB3O1pFewwldBVGYfkGqhd4rVU3+ +29Hug6Ghee2PR+4gWbxbPlvNvKr1fdNaoszknSih5eB/iZ25p3QtGKT3dA1wj7n7 +vaK3rm4SfwYnJ+T9Qa9Wmyv/vugPuovVAH0JxpPpziJtelcVeQrEoZfCzm6gzv6U +sIKYwEBx8av830JU/d9P/dzG7PMUJ7vv -----END CERTIFICATE----- diff --git a/docker/certs/server.key b/docker/certs/server.key index 4a276155..d8e947b1 100644 --- a/docker/certs/server.key +++ b/docker/certs/server.key @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -Lnhe7iE04xzagxh4yli41pkJWEv1Mhk= +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 +/qlzaPqzAXsdgqOqyXEJ5x3gxmfemw== -----END PRIVATE KEY----- diff --git a/docker/certs/server.pem b/docker/certs/server.pem index ed8429e4..1c2cf9e2 100644 --- a/docker/certs/server.pem +++ b/docker/certs/server.pem @@ -1,83 +1,83 @@ -----BEGIN PRIVATE KEY----- -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 -Lnhe7iE04xzagxh4yli41pkJWEv1Mhk= +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 +/qlzaPqzAXsdgqOqyXEJ5x3gxmfemw== -----END PRIVATE KEY----- -----BEGIN CERTIFICATE----- -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 -dgddeBaax7GTJImkDo8ExraWDokv0MsE +BQcDAjAdBgNVHQ4EFgQUTO5ZZ+/akKYt156AFTj8iJ1BfmQwHwYDVR0jBBgwFoAU +RHcTzm1u6x8WiXeAWDblHzwBt9kwDQYJKoZIhvcNAQELBQADggIBAIhdGWm+ph6+ +t+0EKkcQSnFH7vOdyERBV3BWH+aWacO3HV8xq4U8CITNTDEIIJ0lU0RSjlqhbQOS +Y+ug8GDmmkk6FqPV7mcG5mCDRA2WNOF6l9aVE7kVaR6eIKJ1p8VGdmUrInNLzuOX +sAnuf4TKXDGDda6qE0IckKu32xN2dTMwp/rb+HodZ38VMznUy214iY1KMuYp0XGZ +Nw3QkEaDu/aXelSjipDRvIwvTj/dsL4yt3Cw4QorMrzHEd4gwiJ74F6KZx5oqrcl +CNwfkrVWQIkXqkKtleuLncOaoj2gsYBdDO++nz6yXXSWgQarlarmhcTPrB89hXjv +qNdVA/itWV46958t32eq/BXB2y4G/F4OLED1rBELPqM3LZ/EnkTqZOQr3Wd/Nxni +uo/NU0wH1YQ12cp5NlBee3v/Tu0BZQoc/pBAUU0ZrSevN2aqp+08iK00r3lbcK2/ +FCdTKYxMWNTspwlrcdt4Nnzu9i5YtwoA247WTB3O1pFewwldBVGYfkGqhd4rVU3+ +29Hug6Ghee2PR+4gWbxbPlvNvKr1fdNaoszknSih5eB/iZ25p3QtGKT3dA1wj7n7 +vaK3rm4SfwYnJ+T9Qa9Wmyv/vugPuovVAH0JxpPpziJtelcVeQrEoZfCzm6gzv6U +sIKYwEBx8av830JU/d9P/dzG7PMUJ7vv -----END CERTIFICATE----- diff --git a/src/client/tls_stream/rustls_tls_stream.rs b/src/client/tls_stream/rustls_tls_stream.rs index 0ccd0af9..e417583a 100644 --- a/src/client/tls_stream/rustls_tls_stream.rs +++ b/src/client/tls_stream/rustls_tls_stream.rs @@ -17,17 +17,16 @@ use tokio_rustls::{ HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier, WantsTransparencyPolicyOrClientCert, }, - internal::msgs::handshake::DigitallySignedStruct, - Certificate, ClientConfig, ConfigBuilder, Error as RustlsError, RootCertStore, ServerName, - WantsVerifier, + Certificate, ClientConfig, ConfigBuilder, DigitallySignedStruct, Error as RustlsError, + RootCertStore, ServerName, WantsVerifier, }, TlsConnector, }; use tokio_util::compat::{Compat, FuturesAsyncReadCompatExt, TokioAsyncReadCompatExt}; use tracing::{event, Level}; -impl From for Error { - fn from(e: tokio_rustls::webpki::Error) -> Self { +impl From for Error { + fn from(e: tokio_rustls::rustls::Error) -> Self { crate::Error::Tls(e.to_string()) } }