diff --git a/object_store/Cargo.toml b/object_store/Cargo.toml index d5cf91c3324f..e7f99e529e07 100644 --- a/object_store/Cargo.toml +++ b/object_store/Cargo.toml @@ -52,7 +52,7 @@ serde_json = { version = "1.0", default-features = false, optional = true } rand = { version = "0.8", default-features = false, features = ["std", "std_rng"], optional = true } reqwest = { version = "0.11", default-features = false, features = ["rustls-tls-native-roots"], optional = true } ring = { version = "0.17", default-features = false, features = ["std"], optional = true } -rustls-pemfile = { version = "1.0", default-features = false, optional = true } +rustls-pemfile = { version = "2.0", default-features = false, features = ["std"], optional = true } tokio = { version = "1.25.0", features = ["sync", "macros", "rt", "time", "io-util"] } [target.'cfg(target_family="unix")'.dev-dependencies] diff --git a/object_store/src/gcp/credential.rs b/object_store/src/gcp/credential.rs index 29c7b4563ad5..dc504da05723 100644 --- a/object_store/src/gcp/credential.rs +++ b/object_store/src/gcp/credential.rs @@ -304,8 +304,8 @@ fn decode_first_rsa_key(private_key_pem: String) -> Result { // Reading from string is infallible match rustls_pemfile::read_one(&mut reader).unwrap() { - Some(Item::PKCS8Key(key)) => Ok(RsaKeyPair::from_pkcs8(&key)?), - Some(Item::RSAKey(key)) => Ok(RsaKeyPair::from_der(&key)?), + Some(Item::Pkcs8Key(key)) => Ok(RsaKeyPair::from_pkcs8(key.secret_pkcs8_der())?), + Some(Item::Pkcs1Key(key)) => Ok(RsaKeyPair::from_der(key.secret_pkcs1_der())?), _ => Err(Error::MissingKey), } }