Bump Rust dependencies

crates/axum-utils/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-async-trait = "0.1.52"
+async-trait = "0.1.53"
 axum = { version = "0.5.1", features = ["headers"] }
 bincode = "1.3.3"
 chrono = "0.4.19"

crates/cli/Cargo.toml

@@ -9,24 +9,24 @@ license = "Apache-2.0"
 tokio = { version = "1.17.0", features = ["full"] }
 futures = "0.3.21"
 anyhow = { version = "1.0.56", features = ["backtrace"] }
-clap = { version = "3.1.6", features = ["derive"] }
+clap = { version = "3.1.8", features = ["derive"] }
 dotenv = "0.15.0"
 schemars = { version = "0.8.8", features = ["url", "chrono"] }
 tower = { version = "0.4.12", features = ["full"] }
-hyper = { version = "0.14.17", features = ["full"] }
+hyper = { version = "0.14.18", features = ["full"] }
 serde_yaml = "0.8.23"
 serde_json = "1.0.79"
 url = "2.2.2"
-argon2 = { version = "0.3.4", features = ["password-hash"] }
+argon2 = { version = "0.4.0", features = ["password-hash"] }
 reqwest = { version = "0.11.10", features = ["rustls-tls"], default-features = false, optional = true }
-watchman_client = "0.7.1"
+watchman_client = "0.7.2"
 atty = "0.2.14"
 rand = "0.8.5"
 data-encoding = "2.3.2"
 
 tracing = "0.1.32"
 tracing-appender = "0.2.2"
-tracing-subscriber = { version = "0.3.9", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.10", features = ["env-filter"] }
 tracing-opentelemetry = "0.17.2"
 opentelemetry = { version = "0.17.0", features = ["trace", "metrics", "rt-tokio"] }
 opentelemetry-semantic-conventions = "0.9.0"

crates/config/Cargo.toml

@@ -8,7 +8,7 @@ license = "Apache-2.0"
 [dependencies]
 tokio = { version = "1.17.0", features = [] }
 tracing = { version = "0.1.32", features = ["log"] }
-async-trait = "0.1.52"
+async-trait = "0.1.53"
 
 thiserror = "1.0.30"
 anyhow = "1.0.56"
@@ -22,15 +22,15 @@ serde = { version = "1.0.136", features = ["derive"] }
 serde_with = { version = "1.12.0", features = ["hex", "chrono"] }
 serde_json = "1.0.79"
 sqlx = { version = "0.5.11", features = ["runtime-tokio-rustls", "postgres"] }
-lettre = { version = "0.10.0-rc.4", default-features = false, features = ["serde", "builder"] }
+lettre = { version = "0.10.0-rc.5", default-features = false, features = ["serde", "builder"] }
 
 rand = "0.8.5"
-rsa = { git = "https://github.com/RustCrypto/RSA.git" }
+rsa = "0.6.0-pre"
 p256 = { version = "0.10.1", features = ["ecdsa", "pem", "pkcs8"] }
 pkcs8 = { version = "0.8.0", features = ["pem"] }
-chacha20poly1305 = { version = "0.9.0", features = ["std"] }
+chacha20poly1305 = { version = "0.10.0-pre", features = ["std"] }
 elliptic-curve = { version = "0.11.12", features = ["pem", "pkcs8"] }
-pem-rfc7468 = "0.3.1"
+pem-rfc7468 = "0.5.1"
 cookie = { version = "0.16.0", features = ["private", "key-expansion"] }
 data-encoding = "2.3.2"
 

crates/config/src/sections/secrets.rs

@@ -253,11 +253,7 @@ impl ConfigurationSection<'_> for SecretsConfig {
         .context("could not join blocking task")??;
         let rsa_key = KeyConfig {
             r#type: KeyType::Rsa,
-            key: KeyOrPath::Key(
+            key: KeyOrPath::Key(rsa_key.to_pkcs1_pem(pkcs8::LineEnding::LF)?.to_string()),
-                rsa_key
-                    .to_pkcs1_pem(pem_rfc7468::LineEnding::LF)?
-                    .to_string(),
-            ),
         };
 
         let span = tracing::info_span!("ecdsa");
@@ -272,7 +268,7 @@ impl ConfigurationSection<'_> for SecretsConfig {
         .context("could not join blocking task")?;
         let ecdsa_key = KeyConfig {
             r#type: KeyType::Ecdsa,
-            key: KeyOrPath::Key(ecdsa_key.to_pem(pem_rfc7468::LineEnding::LF)?.to_string()),
+            key: KeyOrPath::Key(ecdsa_key.to_pem(pkcs8::LineEnding::LF)?.to_string()),
         };
 
         Ok(Self {

crates/email/Cargo.toml

@@ -7,16 +7,17 @@ license = "Apache-2.0"
 
 [dependencies]
 anyhow = "1.0.56"
-async-trait = "0.1.52"
+async-trait = "0.1.53"
 tokio = { version = "1.17.0", features = ["macros"] }
 tracing = "0.1.32"
-aws-sdk-sesv2 = "0.8.0"
+aws-sdk-sesv2 = "0.9.0"
-aws-config = "0.8.0"
+aws-config = "0.9.0"
+aws-types = "0.9.0"
 
 mas-templates = { path = "../templates" }
 mas-config = { path = "../config" }
 
 [dependencies.lettre]
-version = "0.10.0-rc.4"
+version = "0.10.0-rc.5"
 default-features = false
 features = ["tokio1-rustls-tls", "hostname", "builder", "tracing", "pool", "smtp-transport", "sendmail-transport"]

crates/email/src/transport/aws_ses.rs

@@ -35,7 +35,7 @@ impl Transport {
 
     /// Constructs a [`Transport`] from a given AWS shared config
     #[must_use]
-    pub fn new(config: &aws_config::Config) -> Self {
+    pub fn new(config: &aws_types::SdkConfig) -> Self {
         let config = aws_sdk_sesv2::Config::from(config);
         let client = Client::from_conf(config);
         Self { client }

crates/handlers/Cargo.toml

@@ -20,13 +20,13 @@ thiserror = "1.0.30"
 anyhow = "1.0.56"
 
 # Web server
-hyper = { version = "0.14.17", features = ["full"] }
+hyper = { version = "0.14.18", features = ["full"] }
 tower = "0.4.12"
 axum = "0.5.1"
 axum-macros = "0.2.0"
 
 # Emails
-lettre = { version = "0.10.0-rc.4", default-features = false, features = ["builder"] }
+lettre = { version = "0.10.0-rc.5", default-features = false, features = ["builder"] }
 
 # Database access
 sqlx = { version = "0.5.11", features = ["runtime-tokio-rustls", "postgres"] }
@@ -38,10 +38,10 @@ serde_json = "1.0.79"
 serde_urlencoded = "0.7.1"
 
 # Password hashing
-argon2 = { version = "0.3.4", features = ["password-hash"] }
+argon2 = { version = "0.4.0", features = ["password-hash"] }
 
 # Crypto, hashing and signing stuff
-rsa = { git = "https://github.com/RustCrypto/RSA.git" }
+rsa = "0.6.0-pre"
 pkcs8 = { version = "0.8.0", features = ["pem"] }
 elliptic-curve = { version = "0.11.12", features = ["pem"] }
 sha2 = "0.10.2"

crates/http/Cargo.toml

@@ -10,7 +10,7 @@ bytes = "1.1.0"
 futures-util = "0.3.21"
 http = "0.2.6"
 http-body = "0.4.4"
-hyper = "0.14.17"
+hyper = "0.14.18"
 hyper-rustls = { version = "0.23.0", features = ["http1", "http2"] }
 opentelemetry = "0.17.0"
 opentelemetry-http = "0.6.0"

crates/iana-codegen/Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [dependencies]
 anyhow = "1.0.56"
-async-trait = "0.1.52"
+async-trait = "0.1.53"
 convert_case = "0.5.0"
 csv = "1.1.6"
 futures-util = "0.3.21"
@@ -15,4 +15,4 @@ reqwest = { version = "0.11.10", features = ["blocking", "rustls-tls"], default-
 serde = { version = "1.0.136", features = ["derive"] }
 tokio = { version = "1.17.0", features = ["full"] }
 tracing = "0.1.32"
-tracing-subscriber = "0.3.9"
+tracing-subscriber = "0.3.10"

crates/jose/Cargo.toml

@@ -7,8 +7,8 @@ license = "Apache-2.0"
 
 [dependencies]
 anyhow = "1.0.56"
-async-trait = "0.1.52"
+async-trait = "0.1.53"
-base64ct = { version = "1.0.1", features = ["std"] }
+base64ct = { version = "1.5.0", features = ["std"] }
 chrono = { version = "0.4.19", features = ["serde"] }
 crypto-mac = { version = "0.11.1", features = ["std"] }
 digest = "0.10.3"
@@ -21,7 +21,7 @@ p256 = { version = "0.10.1", features = ["ecdsa", "pem", "pkcs8"] }
 pkcs1 = { version = "0.3.3", features = ["pem", "pkcs8"] }
 pkcs8 = { version = "0.8.0", features = ["pem"] }
 rand = "0.8.5"
-rsa = { git = "https://github.com/RustCrypto/RSA.git" }
+rsa = "0.6.0-pre"
 schemars = "0.8.8"
 sec1 = "0.2.1"
 serde = { version = "1.0.136", features = ["derive"] }

crates/storage/Cargo.toml

@@ -16,8 +16,8 @@ anyhow = "1.0.56"
 tracing = "0.1.32"
 
 # Password hashing
-argon2 = { version = "0.3.4", features = ["password-hash"] }
+argon2 = { version = "0.4.0", features = ["password-hash"] }
-password-hash = { version = "0.3.2", features = ["std"] }
+password-hash = { version = "0.4.0", features = ["std"] }
 rand = "0.8.5"
 url = { version = "2.2.2", features = ["serde"] }
 

crates/tasks/Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [dependencies]
 tokio = "1.17.0"
-async-trait = "0.1.52"
+async-trait = "0.1.53"
 tokio-stream = "0.1.8"
 futures-util = "0.3.21"
 tracing = "0.1.32"