Fix trussed imports

Author: robin-nitrokey

src/backend.rs

@@ -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::{

src/backend/data.rs

@@ -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;
@@ -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 {