summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Stock <stuart@int08h.com>2020-03-21 14:01:32 -0500
committerStuart Stock <stuart@int08h.com>2020-03-21 14:01:32 -0500
commitb522c9f5b5801f180abb5ad955d4e7c48ce05c9a (patch)
treeffe68774749d8e7ff5bf817eb5129370a2b57646
parent8787aa25957aede7afed2c0b0868798e15e122ba (diff)
downloadroughenough-b522c9f5b5801f180abb5ad955d4e7c48ce05c9a.zip
downgrade bytes and rusoto crates to resolve incompatibilites
-rw-r--r--Cargo.toml6
-rw-r--r--src/kms/awskms.rs3
2 files changed, 4 insertions, 5 deletions
diff --git a/Cargo.toml b/Cargo.toml
index bf60348..34a5d38 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ gcpkms = ["google-cloudkms1", "hyper", "hyper-rustls", "serde", "serde_json", "y
[dependencies]
base64 = "0.12"
byteorder = "1"
-bytes = "0.5"
+bytes = "0.4"
chrono = "0.4"
clap = "2"
ctrlc = { version = "3.1", features = ["termination"] }
@@ -36,8 +36,8 @@ untrusted = "0.6"
yaml-rust = "0.4"
# Used by 'awskms'
-rusoto_core = { version = "0.43", optional = true }
-rusoto_kms = { version = "0.43", optional = true }
+rusoto_core = { version = "0.42", optional = true }
+rusoto_kms = { version = "0.42", optional = true }
# Used by 'gcpkms'
# google-cloudkms1 intentionally uses an old version of Hyper. See
diff --git a/src/kms/awskms.rs b/src/kms/awskms.rs
index e4bc3eb..9a9a061 100644
--- a/src/kms/awskms.rs
+++ b/src/kms/awskms.rs
@@ -18,14 +18,13 @@ pub mod inner {
use std::collections::HashMap;
use std::default::Default;
- use std::error::Error;
use std::fmt;
use std::fmt::Formatter;
use std::str::FromStr;
use rusoto_core::Region;
use rusoto_kms::{DecryptRequest, EncryptRequest, Kms, KmsClient};
- use self::bytes::Bytes;
+ use bytes::Bytes;
use crate::kms::{EncryptedDEK, KmsError, KmsProvider, PlaintextDEK, AD, DEK_SIZE_BYTES};