moved key_derivation.rs from pbs_datastore to pbs-config/src/key_config.rs

Also moved pbs-datastore/src/crypt_config.rs to pbs-tools/src/crypt_config.rs.
We do not want to depend on pbs-api-types there, so I use [u8;32] instead of
Fingerprint.
This commit is contained in:
Dietmar Maurer
2021-09-07 09:22:14 +02:00
parent ed2080762c
commit bbdda58b35
38 changed files with 79 additions and 65 deletions

View File

@ -12,7 +12,7 @@ use proxmox::{
};
use pbs_api_types::{Fingerprint, KeyInfo, Kdf};
use pbs_datastore::key_derivation::KeyConfig;
use pbs_config::key_config::KeyConfig;
use pbs_config::open_backup_lockfile;
use crate::{

View File

@ -4,7 +4,8 @@ use std::sync::Arc;
use anyhow::{bail, Error};
use pbs_datastore::crypt_config::{CryptConfig, CryptMode};
use pbs_tools::crypt_config::CryptConfig;
use pbs_api_types::CryptMode;
use pbs_datastore::data_blob::DataBlob;
use pbs_datastore::read_chunk::{ReadChunk, AsyncReadChunk};

View File

@ -17,8 +17,7 @@ use serde::{Deserialize, Serialize};
use proxmox::tools::fs::file_read_optional_string;
use pbs_api_types::Fingerprint;
use pbs_datastore::key_derivation::KeyConfig;
use pbs_config::key_config::KeyConfig;
use pbs_config::{open_backup_lockfile, replace_secret_config};
mod hex_key {

View File

@ -28,7 +28,7 @@ use proxmox::{
};
use pbs_api_types::Fingerprint;
use pbs_datastore::key_derivation::KeyConfig;
use pbs_config::key_config::KeyConfig;
use pbs_tools::run_command;
use crate::{

View File

@ -28,11 +28,10 @@ use proxmox::{
api::section_config::SectionConfigData,
};
use pbs_api_types::Fingerprint;
use pbs_datastore::key_derivation::KeyConfig;
use pbs_api_types::{VirtualTapeDrive, LtoTapeDrive, Fingerprint};
use pbs_config::key_config::KeyConfig;
use pbs_datastore::task::TaskState;
use pbs_datastore::task_log;
use pbs_api_types::{VirtualTapeDrive, LtoTapeDrive};
use crate::{
server::{

View File

@ -10,7 +10,7 @@ use proxmox::tools::{
fs::{replace_file, CreateOptions},
};
use pbs_datastore::key_derivation::KeyConfig;
use pbs_config::key_config::KeyConfig;
use crate::{
tape::{