Skip to content

Commit

Permalink
Brings navajo::envelope::sync::Envelope in line with navajo::Envelope (
Browse files Browse the repository at this point in the history
  • Loading branch information
chanced committed Apr 25, 2023
1 parent 456cd2e commit b399e6f
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 34 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.0.4] 2023-04-25
- navajo: `envelope::sync::Envelope` associated error types no longer require `Error`, bringing it inline with `envelope::Envelope`

## [0.0.3] 2023-04-24

### Added
Expand Down
30 changes: 4 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions navajo-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "navajo-cli"
version = "0.0.3"
version = "0.0.4"
edition = "2021"
license = "MIT OR Apache-2.0"
authors = ["Chance Dinkins"]
Expand All @@ -10,14 +10,14 @@ description = "Navajo CLI"
name = "navajo"

[dependencies]
navajo = { version = "0.0.3", features = [
navajo = { version = "0.0.4", features = [
"std",
"blake3",
"sha3",
"cmac",
"aes",
] }
navajo-gcp = { version = "0.0.2" }
navajo-gcp = { version = "0.0.4" }

strum = { version = "0.24", features = ["derive", "strum_macros"] }
clap = { version = "4.2", features = ["derive", "wrap_help", "env"] }
Expand Down
4 changes: 2 additions & 2 deletions navajo-gcp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "navajo-gcp"
version = "0.0.3"
version = "0.0.4"
edition = "2021"
license = "MIT OR Apache-2.0"
authors = ["Chance Dinkins"]
description = "Navajo GCP KMS integration"

[dependencies]
kms-aead = { version = "0.15", features = ["gcp-kms-encryption"] }
navajo = "0.0.3"
navajo = "0.0.4"
tokio = { version = "1.26", features = ["full"] }
secret-vault-value = { version = "0.3" }
async-trait = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion navajo/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

[package]
name = "navajo"
version = "0.0.3"
version = "0.0.4"
edition = "2021"
license = "MIT OR Apache-2.0"
authors = ["Chance Dinkins"]
Expand Down
4 changes: 2 additions & 2 deletions navajo/src/envelope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ pub mod sync {
use alloc::vec::Vec;

pub trait Envelope {
type EncryptError: super::Error + Send + Sync;
type DecryptError: super::Error + Send + Sync;
type EncryptError: core::fmt::Display + core::fmt::Debug + Send + Sync;
type DecryptError: core::fmt::Display + core::fmt::Debug + Send + Sync;

fn encrypt_dek<A, P>(
&self,
Expand Down

0 comments on commit b399e6f

Please sign in to comment.