Skip to content

Fix trussed imports #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
robin-nitrokey wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix trussed imports #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ use trussed::{
key::{Kind, Secrecy},
platform::Platform,
serde_extensions::ExtensionImpl,
service::{Keystore, ServiceResources},
store::filestore::Filestore,
types::{CoreContext, Location, PathBuf},
Bytes,
service::ServiceResources,
store::{filestore::Filestore, keystore::Keystore},
types::{Bytes, CoreContext, Location, PathBuf},
};

use crate::{
Expand Down
7 changes: 3 additions & 4 deletions src/backend/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ use core::ops::Deref;

use chacha20poly1305::ChaCha8Poly1305;
use hmac::{Hmac, Mac};
use rand_core::{CryptoRng, RngCore};
use serde::{Deserialize, Serialize};
use serde_byte_array::ByteArray;
use sha2::{Digest as _, Sha256};
use subtle::ConstantTimeEq as _;
use trussed::{
platform::{CryptoRng, RngCore},
store::filestore::Filestore,
types::{Location, PathBuf},
Bytes,
types::{Bytes, Location, PathBuf},
};

use super::Error;
Expand Down Expand Up @@ -515,7 +514,7 @@ pub(crate) fn get_app_salt<S: Filestore, R: CryptoRng + RngCore>(
pub(crate) fn delete_app_salt<S: Filestore>(
fs: &mut S,
location: Location,
) -> Result<(), trussed::Error> {
) -> Result<(), trussed::error::Error> {
if fs.exists(&app_salt_path(), location) {
fs.remove_file(&app_salt_path(), location)
} else {
Expand Down